Remove now obsolete conflict

discordier · discordier · commit 8ef45f060ce5 · 2016-12-20T23:25:13.000+01:00
diff --git a/composer.json b/composer.json
@@ -37,9 +37,6 @@
         "phpcq/all-tasks": "~1.1",
         "metamodels/base-unit-tests": "~1.0"
     },
-    "conflict": {
-        "contao/core": "3.4.0"
-    },
     "autoload": {
         "psr-0": {
             "MetaModels\\": "src"
