Skip to content

use diff code block #9355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 27, 2018
Merged

use diff code block #9355

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions setup/flex.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down