Merged from upstream

Semantic-Org · Nov 7, 2014 · 1a69902 · 1a69902
2 parents 5bc019a + c2dc7fc
commit 1a69902
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -14,5 +14,9 @@
     "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,9 +141,12 @@ a.ui.nag {
          Theme Overrides
 *******************************/
 
+<<<<<<< HEAD
 
 
 /*******************************
         User Overrides
 *******************************/
 
+=======
+>>>>>>> c2dc7fc1e26f952e4a3bdb71f8aa9964744667d6
diff --git a/package.json b/package.json
@@ -1,6 +1,10 @@
 {
   "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",
@@ -13,9 +17,16 @@
   "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"
 }