From 48309eb79b51e5d19ca7112ff4203f4b2f7c2ff7 Mon Sep 17 00:00:00 2001
From: Ash Wilson <smashwilson@gmail.com>
Date: Mon, 2 Nov 2015 15:38:00 -0500
Subject: [PATCH] Prepare 1.3.7 release

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c9bb4db..3ebae03 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "merge-conflicts",
   "main": "./lib/main",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "private": true,
   "description": "Resolve git conflicts within Atom",
   "contributors": [