fixes merge issues

2015-07-08 11:35:55 +02:00
parent bcb5883230
commit 1a2849dfb0
4 changed files with 34 additions and 34 deletions
--- a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
+++ b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
@@ -20,7 +20,7 @@
    'lib/jquery-file-upload/jquery.fileupload-angular.js',

    'lib/bootstrap/js/bootstrap.2.3.2.min.js',
-    'lib/bootstrap-tabdrop/bootstrap-tabdrop.js',
+    'lib/bootstrap-tabdrop/bootstrap-tabdrop.min.js',
 	'lib/umbraco/Extensions.js',
    
    'lib/umbraco/NamespaceManager.js',