merge fix

cohen72 · cohen72 · commit 04c862324584 · 2020-12-24T15:42:08.000+02:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "git-playground",
-	"version": "1.0.14-qa.2",
+	"version": "1.0.14",
 	"private": true,
 	"scripts": {
 		"postversion": "react-native-version --never-amend"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "git-playground",`
`3`		`- "version": "1.0.14-qa.2",`
	`3`	`+ "version": "1.0.14",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
`6`	`6`	`"postversion": "react-native-version --never-amend"`