resolve conflicts

Merge branch 'devel' of github.com:SantanderMetGroup/geoprocessoR into devel Conflicts: R/overGrid.R
SantanderMetGroup · Apr 16, 2019 · c335060 · c335060
2 parents f80f057 + 12d5c56
commit c335060
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/R/overGrid.R b/R/overGrid.R
@@ -36,8 +36,6 @@
 #' @author M. Iturbide
 #' @family subsetting
 #' @export
-#' @examples
-
 
 overGrid <- function(grid, layer, subset = FALSE) {
       # commented lines are for posible runtime dimension consideration,

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 A package with tools for climate data geoprocessing. 
 
-This package is part of the [climate4R bundle](http://www.meteo.unican.es/climate4r), formed by the core packages `loadeR`, `transformeR`, `downscaleR` and `visualizeR`.
+This package is part of the [climate4R bundle](http://www.meteo.unican.es/climate4r), which is formed by the core packages `loadeR`, `transformeR`, `downscaleR` and `visualizeR`.
 
 The recommended installation procedure is to use the `install_github` command from the devtools R package (see the installation info in the wiki):