Fix a bug where options wouldn't be applied correctly

RadLikeWhoa · May 25, 2013 · 347b792 · 347b792
1 parent 7eb5942
commit 347b792
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/bower.json b/bower.json
@@ -1,10 +1,6 @@
 {
   "name": "Countable",
-<<<<<<< HEAD
   "version": "2.0.0",
-=======
-  "version": "1.4.2",
->>>>>>> Version bump
   "main": "Countable.js",
   "ignore": [ "CONTRIBUTING.md" ]
 }