Fix merge conflicts.

Merge branch 'CR' # Conflicts: # NEWS.md # cran-comments.md
forestgeo · Jun 19, 2019 · c0d0d54 · c0d0d54
2 parents ba7374e + c509d20
commit c0d0d54
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: fgeo.plot
 Title: Plot ForestGEO Data
-Version: 1.1.8.9000
+Version: 1.1.9
 Authors@R: 
     c(person(given = "Mauro",
              family = "Lepore",

diff --git a/NEWS.md b/NEWS.md
@@ -2,7 +2,7 @@
 
 * Work in progress.
 
-# fgeo.plot 1.1.8.9000
+# fgeo.plot 1.1.9
 
 * Maintenance release.
 

diff --git a/cran-comments.md b/cran-comments.md
@@ -14,13 +14,6 @@ New maintainer:
 Old maintainer(s):  
   Mauro Lepore <leporem@si.edu>  
 
-
-
-FIXME: Version contains large components (1.1.8.9000)
-
-
-
-
 ## Downstream dependencies
 
 We checked 1 reverse dependencies from CRAN, comparing R CMD check results across CRAN and dev versions of this package: