Increment version number to 1.2.0

r-lib · Jan 31, 2023 · 60f960f · 60f960f
1 parent 3ecb6cd
commit 60f960f
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.1.0.9000
+Version: 1.2.0
 Authors@R: c(
     person("Hadley", "Wickham", , "hadley@rstudio.com", role = c("aut", "cre")),
     person("RStudio", role = c("cph", "fnd"))

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# conflicted (development version)
+# conflicted 1.2.0
 
 * New `conflicts_prefer()` to easily declare multiple preferences at once:
   `conflicts_prefer(dplyr::filter, lubridate::week, ...)` (#82).