jonatanpedersen
diff --git a/‎package-lock.json‎
Lines changed: 2 additions & 2 deletions b/‎package-lock.json‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎package.json‎
Lines changed: 2 additions & 2 deletions b/‎package.json‎
Lines changed: 2 additions & 2 deletions
@@ -1,6 +1,6 @@
 {
   "name": "git-json-merge",
-  "version": "0.4.5",
+  "version": "1.0.0",
   "description": "a git merge driver for json files",
   "scripts": {
     "postversion": "git push && git push --tags",
@@ -32,4 +32,4 @@
   "engines": {
     "node": ">=6"
   }
-}
+}
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "git-json-merge",`
`3`		`- "version": "0.4.5",`
	`3`	`+ "version": "1.0.0",`
`4`	`4`	`"description": "a git merge driver for json files",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"postversion": "git push && git push --tags",`
`@@ -32,4 +32,4 @@`
`32`	`32`	`"engines": {`
`33`	`33`	`"node": ">=6"`
`34`	`34`	`}`
`35`		`-}`
	`35`	`+}`