Prepare for release

r-lib · May 1, 2019 · 59eeaed · 59eeaed
1 parent 34c83fd
commit 59eeaed
Show file tree

Hide file tree

Showing 2 changed files with 4 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.2.9000
+Version: 1.0.3
 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,6 @@
-# conflicted (development version)
+# conflicted 1.0.3
+
+* Fix > vs >= mistake
 
 # conflicted 1.0.2