diff --git a/composer.json b/composer.json index 0683999..ea19223 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,8 @@ }, "conflict": { "jms/serializer": "<0.12", - "jms/serializer-bundle": "<0.11" + "jms/serializer-bundle": "<0.11", + "twig/twig": "<1.12" }, "require-dev": { "symfony/css-selector": "~2.3",