From ccfdead97b2c7f90443a45fd1157ebd1c6ae3ec6 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@xabbuh.de>
Date: Tue, 27 Feb 2018 10:21:03 +0100
Subject: [PATCH] use diff code block

---
 setup/flex.rst | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/setup/flex.rst b/setup/flex.rst
index 80e53b591a5..c0fc7ae1200 100644
--- a/setup/flex.rst
+++ b/setup/flex.rst
@@ -181,11 +181,16 @@ manual steps:
    ``composer.json`` file as `shown in this example of the skeleton-project`_ so that
    it will not be installed again:
 
-   .. code-block:: json
-
-        "conflict": {
-            "symfony/symfony": "*"
-        },
+   .. code-block:: diff
+
+       {
+           "require": {
+               "symfony/flex": "^1.0",
+       +     },
+       +     "conflict": {
+       +         "symfony/symfony": "*"
+           }
+       }
 
    Now you must add in ``composer.json`` all the Symfony dependencies required
    by your project. A quick way to do that is to add all the components that