From b6a397bc8893469a9c0956ad56efe41797fad6e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Noco=C5=84?= <mnocon@users.noreply.github.com>
Date: Mon, 14 Jan 2019 15:50:34 +0100
Subject: [PATCH] [Composer] Add conflict for Twig 2.6.1 (#347)

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 3dc806119b..39d3becda2 100644
--- a/composer.json
+++ b/composer.json
@@ -69,7 +69,8 @@
     },
     "conflict": {
         "symfony/symfony": "3.4.9||3.4.12||3.4.16",
-        "doctrine/dbal": "2.7.0"
+        "doctrine/dbal": "2.7.0",
+        "twig/twig": "2.6.1"
     },
     "scripts": {
         "symfony-scripts": [