From 37bc4ffe89d5d446d263d4a1745f7516b3bf49db Mon Sep 17 00:00:00 2001
From: Michael RICOIS <mricois@scores-decisions.com>
Date: Mon, 26 Sep 2016 11:59:23 +0200
Subject: [PATCH] Comment noConflict

---
 public/themes/default/scripts/script.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/themes/default/scripts/script.js b/public/themes/default/scripts/script.js
index 1b10caa30..766563b62 100644
--- a/public/themes/default/scripts/script.js
+++ b/public/themes/default/scripts/script.js
@@ -1,5 +1,5 @@
-var bootstrapButton = $.fn.button.noConflict();
-$.fn.bootstrapBtn = bootstrapButton;
+//var bootstrapButton = $.fn.button.noConflict();
+//$.fn.bootstrapBtn = bootstrapButton;
 $(function(){
 	$('ul#side-menu').metisMenu();
 	$('img.flag').on('click', function() {