composer.json update (switch to dev-master, soon-to-be-released Neos …

…1.3)
million12 · Feb 10, 2015 · d7730df · d7730df
1 parent 0b18be4
commit d7730df
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -4,23 +4,16 @@
     "description": "Foundation content elements",
     "license": ["MIT"],
     "authors": [
-        {
-            "name": "Marcin Ryzycki",
-            "email": "[email protected]",
-            "homepage": "http://m12.io",
-            "role": "Developer"
-        },
-        {
-            "name": "Samuel Ryzycki",
-            "email": "[email protected]",
-            "homepage": "http://m12.io",
-            "role": "Developer"
-        }
+        { "name": "Marcin Ryzycki", "role": "Developer", "email": "[email protected]", "homepage": "http://m12.io" },
+        { "name": "Samuel Ryzycki", "role": "Developer", "email": "[email protected]", "homepage": "http://m12.io" }
     ],
     "require": {
-        "typo3/neos-nodetypes": "~1.2.0",
+        "typo3/neos-nodetypes": "*",
         "m12/neos-utils": "*"
     },
+    "conflict": {
+        "typo3/neosdemotypo3org": "*"
+    },
     "autoload": {
         "psr-0": {
             "M12\\Foundation": "Classes"