Commit59eeaed

committed

Prepare for release

1 parent34c83fd commit59eeaedCopy full SHA for 59eeaed

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`Package: conflicted`
`2`	`2`	`Title: An Alternative Conflict Resolution Strategy`
`3`		`-Version: 1.0.2.9000`
	`3`	`+Version: 1.0.3`
`4`	`4`	`Authors@R: c(`
`5`	`5`	`person("Hadley", "Wickham", , "hadley@rstudio.com", role = c("aut", "cre")),`
`6`	`6`	`person("RStudio", role = "cph")`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-#conflicted (development version)`
	`1`	`+#conflicted 1.0.3`
	`2`	`+`
	`3`	`+* Fix > vs >= mistake`
`2`	`4`
`3`	`5`	`#conflicted 1.0.2`
`4`	`6`

Comments

(0)