summaryrefslogtreecommitdiffstats
path: root/src/Symfony/Bundle/FrameworkBundle/composer.json
diff options
context:
space:
mode:
Diffstat (limited to 'src/Symfony/Bundle/FrameworkBundle/composer.json')
-rw-r--r--src/Symfony/Bundle/FrameworkBundle/composer.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 369789b..0e994e6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -64,6 +64,7 @@
"twig/twig": "^1.41|^2.10|^3.0"
},
"conflict": {
+ "doctrine/persistence": "<1.3",
"phpdocumentor/reflection-docblock": "<3.0",
"phpdocumentor/type-resolver": "<0.2.1",
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",