From d4abbd8ab303d9b1d3a28aa18b708d796950d02e Mon Sep 17 00:00:00 2001
From: Scott Erickson <sderickson@gmail.com>
Date: Fri, 11 Apr 2014 12:44:54 -0700
Subject: [PATCH] Merge branch 'mediator' of
 https://github.com/rubenvereecken/codecombat into rubenvereecken-mediator

Conflicts:
	bower.json
---
 bower.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/bower.json b/bower.json
index d336061d4..0c55d76af 100644
--- a/bower.json
+++ b/bower.json
@@ -38,13 +38,10 @@
     "catiline": "~2.9.3",
     "d3": "~3.4.4",
     "nanoscroller": "~0.8.0",
-<<<<<<< HEAD
     "jquery.tablesorter": "~2.15.13",
     "treema": "~0.0.1",
-    "bootstrap": "~3.1.1"
-=======
+    "bootstrap": "~3.1.1",
     "validated-backbone-mediator": "~0.1.3"
->>>>>>> a07457acacd24719568e5abecff2843f59ec97bb
   },
   "overrides": {
     "backbone": {