From ba355255b1ce4e4f55c05c0666b11f386c9c7c9b Mon Sep 17 00:00:00 2001 From: AtomicPages LLC Date: Sun, 27 Jul 2014 11:10:12 -0500 Subject: [PATCH] Update bower.json --- bower.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/bower.json b/bower.json index 0949f64..0ce6b53 100644 --- 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 ] }