From 7d426e86988f7f4a5687b2abb1194fa8713665fd Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 22 Oct 2015 01:39:34 +0400
Subject: [PATCH] use editor lineheight for conflict markers

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

diff --git a/package.json b/package.json
index 327db299..1ddb015f 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": "#dbe07b56e0",
+        "c9.ide.scm": "#dbad171e75",
         "c9.ide.terminal.monitor": "#b76f1c9f24",
         "c9.ide.test": "#ba0ed6e586",
         "c9.ide.test.mocha": "#f6cc482886",