From 4099cdaef3a9bda6ec2ddaedd86eba97a0e971bb Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Mon, 3 Nov 2014 16:03:27 -0200
Subject: [PATCH] Removed declaration of jQuery.noConflict()

---
 colab/proxy/noosfero/templates/proxy/noosfero.html | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/colab/proxy/noosfero/templates/proxy/noosfero.html b/colab/proxy/noosfero/templates/proxy/noosfero.html
index 5b7aef6..dd4e6fe 100644
--- a/colab/proxy/noosfero/templates/proxy/noosfero.html
+++ b/colab/proxy/noosfero/templates/proxy/noosfero.html
@@ -3,26 +3,22 @@
 
 {% block head_css %}
 <link href="{% static 'noosfero/css/bootstrap-colab-style.css' %}" 
-	media="screen, projection" rel="stylesheet" type="text/css">
+      media="screen, projection" rel="stylesheet" type="text/css">
 <link href="{% static 'noosfero/css/screen.css' %}" media="screen, projection" rel="stylesheet" type="text/css">
 <style>
 
 </style>
 {% endblock %}
 
-{% block head_js %}
-<script>jQuery.noConflict();</script>
-{% endblock %}
-
 {% block navbar %}
 <div class="colab-style">
-	{{ block.super }}
+  {{ block.super }}
 </div>
 {% endblock %}
 
 {% block footer %}
 <div class="colab-style">
-	{{ block.super }}
+  {{ block.super }}
 </div>
 {% endblock %}
 
@@ -30,4 +26,4 @@
 {{ block.super }}
 <script src="{% static 'noosfero/js/jquery.dropdown.js' %}" type="text/javascript"></script>
 <script src="{% static 'noosfero/js/collapse.js' %}" type="text/javascript"></script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
--
libgit2 0.21.2