From faa9773840909cd9434e0c87ce0eba43ea47a16d Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 26 Oct 2015 04:11:52 +0400
Subject: [PATCH] fix misaligned buttons in conflict marker

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

diff --git a/package.json b/package.json
index 13718b9b..4836f193 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
         "c9.ide.run.build": "#0598fff697",
         "c9.ide.run.debug.xdebug": "#61dcbd0180",
         "c9.ide.save": "#4a4a60a004",
-        "c9.ide.scm": "#dbad171e75",
+        "c9.ide.scm": "#37a4ed0acf",
         "c9.ide.terminal.monitor": "#b76f1c9f24",
         "c9.ide.test": "#26cd260224",
         "c9.ide.test.mocha": "#f6cc482886",