resolve merge conflicts

Merge branch 'data-backup' # Conflicts: # .Rbuildignore # .github/workflows/R-CMD-check.yaml # DESCRIPTION # NEWS.md # R/downloader.R # R/vyskopis.R # README.md # data-raw/Dockerfile # joss-paper/paper.md # man/vyskopis.Rd # tests/testthat/test-1-relief.R # tests/testthat/test-2-code-internal.R # vignette.Rmd.orig # vignettes/relief-1.png # vignettes/vignette.Rmd
jlacko · Oct 23, 2023 · 30a7c66 · 30a7c66
2 parents 836e1b3 + be35c9a
commit 30a7c66
Show file tree

Hide file tree

Showing 18 changed files with 2 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ inst/doc
 /data-raw/eu_dem*
 /joss-paper/*.pdf
 *.log
+/docs
diff --git a/README.md b/README.md
@@ -72,7 +72,6 @@ natural:
 * **vyskopis**: terrain of the Czech republic as a {terra} package raster object
 * **geomorfo**: geomorphological division of the Czech Republic
 
-
 All objects are implemented as functions returning data frames, so must be followed by brackets (i.e. `hranice <- republika()`).
 
 ### In addition a number of utility functions is provided: