Fix bower manifest

vorillaz · Jul 18, 2014 · f691b8f · f691b8f
1 parent 419e248
commit f691b8f
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/bower.json b/bower.json
@@ -1,11 +1,7 @@
 {
   "name": "devicons",
   "description": "Devicons - An icon font made for developers",
-<<<<<<< HEAD
   "version": "1.3",
-=======
-  "version": "1.2",
->>>>>>> 62b77bdd8cfc4106088d8d9e9006af8cb4883c11
   "keywords": [
     "icons",
     "devicons",