Prepare 1.4.2 release

smashwilson · smashwilson · commit c29f7eb8d93e · 2016-04-24T20:31:16.000-04:00
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "merge-conflicts",
   "main": "./lib/main",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "private": true,
   "description": "Resolve git conflicts within Atom",
   "contributors": [

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "merge-conflicts",`
`3`	`3`	`"main": "./lib/main",`
`4`		`- "version": "1.4.1",`
	`4`	`+ "version": "1.4.2",`
`5`	`5`	`"private": true,`
`6`	`6`	`"description": "Resolve git conflicts within Atom",`
`7`	`7`	`"contributors": [`