Bump version

r-lib · Mar 29, 2019 · 64b7994 · 64b7994
1 parent ee34cac
commit 64b7994
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: conflicted
 Title: An Alternative Conflict Resolution Strategy
-Version: 1.0.1.9000
+Version: 1.0.2
 Authors@R: c(
     person("Hadley", "Wickham", , "hadley@rstudio.com", role = c("aut", "cre")),
     person("RStudio", role = "cph")

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# conflicted 1.0.1.9000
+# conflicted 1.0.2
 
 * Align with changes to R 3.6