Update bower.json

atomicpages · Jul 27, 2014 · ba35525 · ba35525
1 parent 3875147
commit ba35525
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/bower.json b/bower.json
@@ -1,10 +1,6 @@
 {
 	"name": "skeleton-sass",
-<<<<<<< HEAD
-	"version": "1.6.3",
-=======
 	"version": "2.0.0",
->>>>>>> 2.x
 	"author": "Dennis Thompson",
 	"homepage": "http://atomicpages.github.io/skeleton-sass/",
 	"repository": {
@@ -17,15 +13,9 @@
 			"url": "http://opensource.org/licenses/MIT"
 		}
 	],
-<<<<<<< HEAD
-	"ignore": [
-		"demo",
-		"sass/dev"
-=======
 	"main": "",
 	"ignore": [
 		".gitignore",
 		"sache.json"
->>>>>>> 2.x
 	]
 }