Updated component release from Semantic-UI (Automatic)

Semantic-Org · Nov 7, 2014 · 082505a · 082505a
1 parent 1a69902
commit 082505a
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 18 deletions.
diff --git a/composer.json b/composer.json
@@ -14,9 +14,5 @@
     "jquery": "x.x.x"
   },
   "main": "nag.js",
-<<<<<<< HEAD
   "version": "1.0.0-beta"
-=======
-  "version": "1.0.0"
->>>>>>> c2dc7fc1e26f952e4a3bdb71f8aa9964744667d6
 }
diff --git a/nag.css b/nag.css
@@ -141,12 +141,9 @@ a.ui.nag {
          Theme Overrides
 *******************************/
 
-<<<<<<< HEAD
 
 
 /*******************************
         User Overrides
 *******************************/
 
-=======
->>>>>>> c2dc7fc1e26f952e4a3bdb71f8aa9964744667d6
diff --git a/package.json b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "semantic-ui-nag",
-<<<<<<< HEAD
   "version": "1.0.0-beta",
-=======
-  "version": "1.0.0",
->>>>>>> c2dc7fc1e26f952e4a3bdb71f8aa9964744667d6
   "title": "Semantic UI - Nag",
   "description": "Single component release of nag",
   "homepage": "http://www.semantic-ui.com",
@@ -17,16 +13,9 @@
   "bugs": {
     "url": "https://github.com/Semantic-Org/Semantic-UI/issues"
   },
-<<<<<<< HEAD
   "devDependencies": {},
   "dependencies": {
     "jquery": "x.x.x"
   },
-=======
-  "dependencies": {
-    "jquery": "x.x.x"
-  },
-  "devDependencies": {},
->>>>>>> c2dc7fc1e26f952e4a3bdb71f8aa9964744667d6
   "main": "index.js"
 }