Prepare 1.3.6 release

smashwilson · smashwilson · commit 822f7278db92 · 2015-09-20T11:35:38.000-04:00
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "merge-conflicts",
   "main": "./lib/main",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "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.3.5",`
	`4`	`+ "version": "1.3.6",`
`5`	`5`	`"private": true,`
`6`	`6`	`"description": "Resolve git conflicts within Atom",`
`7`	`7`	`"contributors": [`