diff --git a/composer.json b/composer.json index dd7805e..005aed3 100644 --- a/composer.json +++ b/composer.json @@ -30,6 +30,7 @@ }, "conflict": { "doctrine/doctrine-bundle": "< 2.0.3", + "doctrine/phpcr-odm": "< 2.0", "jackalope/jackalope-jackrabbit": "<2", "jackalope/jackalope": "< 1.3.1", "symfony/dependency-injection": "< 3",