Merge pull request Bttstrp#202 from GrahamCampbell/derp-fixes

Derp Fixes
botzill · Jan 7, 2014 · 0074d4b · 0074d4b
2 parents 98b6ddd + f7ae118
commit 0074d4b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,3 @@
 .grunt
 node_modules
-<<<<<<< HEAD
 components
-=======
-components
->>>>>>> master
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
@@ -113,4 +113,4 @@ module.exports = (grunt) ->
         tasks: ["clean:css", "less", "cssmin", "usebanner:css"]
 
   grunt.registerTask "go", ["build", "connect", "open", "watch"]
-  grunt.registerTask "build", ["clean", "coffeelint", "coffee", "uglify", "usebanner:js", "less", "cssmin", "usebanner:css"]
+  grunt.registerTask "build", ["clean", "coffeelint", "coffee", "uglify", "usebanner:js", "less", "cssmin", "usebanner:css"]
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "bootstrap-switch",
   "description": "Unofficial bootstrap switch",
-  "version": "1.9.0",
+  "version": "2.0.0",
   "main": [
     "build/js/bootstrap-switch.js",
     "build/css/bootstrap3/bootstrap-switch.css"
@@ -12,4 +12,4 @@
   "dependencies": {
     "jquery": ">=1.9.0"
   }
-}
+}
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "nostalgiaz/bootstrap-switch",
   "description": "Unofficial bootstrap switch",
-  "version": "1.9.0",
+  "version": "2.0.0",
   "type": "component",
   "keywords": [
     "javaScript"