From 64b2e5602163a514621adc5f8a76b21220866428 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sat, 18 Feb 2017 18:36:41 +0100
Subject: [PATCH] move conflict section of composer.json

---
 composer.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 84a4a763f4..ecad4326d5 100644
--- a/composer.json
+++ b/composer.json
@@ -24,9 +24,6 @@
         "twig/twig": "~1.28|~2.0",
         "psr/log": "~1.0"
     },
-    "conflict": {
-        "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
-    },
     "replace": {
         "symfony/asset": "self.version",
         "symfony/browser-kit": "self.version",
@@ -85,6 +82,9 @@
         "egulias/email-validator": "~1.2,>=1.2.1",
         "sensio/framework-extra-bundle": "^3.0.2"
     },
+    "conflict": {
+        "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
+    },
     "autoload": {
         "psr-4": {
             "Symfony\\Bridge\\Doctrine\\": "src/Symfony/Bridge/Doctrine/",