Fix a bug where options wouldn't be applied correctly

RadLikeWhoa · RadLikeWhoa · commit 347b792e027e · 2013-05-25T22:03:10.000+02:00
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" ]
 }
