From c609294e1f281acc58b5882dda504756a113b9ce Mon Sep 17 00:00:00 2001
From: Nathan Leniz <terakilobyte@gmail.com>
Date: Sun, 15 Mar 2015 17:06:05 +0900
Subject: [PATCH] force merge conflict for stream viewers

---
 public/js/lib/bonfire/bonfireFramework_v0.1.2.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/public/js/lib/bonfire/bonfireFramework_v0.1.2.js b/public/js/lib/bonfire/bonfireFramework_v0.1.2.js
index 4b2edebb0e..1c8a3eb243 100644
--- a/public/js/lib/bonfire/bonfireFramework_v0.1.2.js
+++ b/public/js/lib/bonfire/bonfireFramework_v0.1.2.js
@@ -17,10 +17,13 @@ editor.setSize("100%", "auto");
 
 // Hijack tab key to enter two spaces intead
 editor.setOption("extraKeys", {
-    Tab: function(cm) {
-        var spaces = Array(cm.getOption("indentUnit") + 1).join(" ");
-        cm.replaceSelection(spaces);
+    Tab: function(mc) {
+        var spaces = Array(mc.getOption("indentUnit") + 1).join(" ");
+        mc.replaceSelection(spaces);
     },
+
+
+
     "Ctrl-Enter": function() {
         bonfireExecute();
         return false;