Merge pull request #109 from WouterJ/patch-2

Remove doctrine phpcr admin conflict
sonata-project · Jun 9, 2016 · 74eacf9 · 74eacf9
2 parents 16e2ff3 + 2108f47
commit 74eacf9
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -39,7 +39,6 @@
     "conflict": {
         "knplabs/doctrine-behaviors": "<1.0 || >=2.0",
         "sonata-project/doctrine-orm-admin-bundle": "<3.0 || >=4.0",
-        "sonata-project/doctrine-phpcr-admin-bundle": "<2.0 || >=3.0",
         "stof/doctrine-extensions-bundle": "<1.1 || >=2.0"
     },
     "autoload": {