From 8a1f0eab709f45aecad5494356bd30d303ce4459 Mon Sep 17 00:00:00 2001
From: Rafael Reggiani Manzo <rr.manzo@gmail.com>
Date: Fri, 5 Jun 2015 16:58:57 -0300
Subject: [PATCH] Fixed JS conflicts with Mezuro

---
 colab/plugins/mezuro/diazo.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/colab/plugins/mezuro/diazo.xml b/colab/plugins/mezuro/diazo.xml
index 85e7479..85a1c02 100644
--- a/colab/plugins/mezuro/diazo.xml
+++ b/colab/plugins/mezuro/diazo.xml
@@ -13,6 +13,6 @@
     <merge attributes="data-project-id" css:theme="body" css:content="body" />
 
     <drop css:content=".navbar" />
-    <!--<drop css:theme="script[src^='/static/third-party/bootstrap/css/bootstrap.min']" />
-    <drop css:theme="script[src^='/static/third-party/jquery-2.0.3.min.js']" /> -->
+    <drop css:theme="script[src^='/static/third-party/bootstrap/js/bootstrap.min.js']" /> <!-- Fixes top menu -->
+    <drop css:theme="script[src^='/static/third-party/jquery-2.0.3.min.js']" /> <!-- Fixes accordion conflict --> <!--FIXME: if colab updates its jquery version this will break -->
 </rules>
--
libgit2 0.21.2