hubli
diff --git a/‎gulpfile.js
-1 b/‎gulpfile.js
-1
diff --git a/‎src/noConflict.coffee
-1 b/‎src/noConflict.coffee
-1
@@ -24,7 +24,6 @@ gulp.task('coffee', function() {
 
 gulp.task('concat', function() {
     fileList = [
-        //'build/js/noConflict.js',
         'build/js/default.js',
         'build/js/app.js',
         'build/js/controller.js',