RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-02 21:41:45 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6658 from Majkl578/fix/allow-stable-yaml

Browse Source 
Drop explicit conflict with stable symfony/yaml
This commit is contained in:
Marco Pivetta 2017-08-30 22:43:28 +02:00 committed by GitHub
commit 68706034e5
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -24,9 +24,6 @@
"doctrine/annotations": "~1.4", "doctrine/annotations": "~1.4",
"symfony/console": "~3.0|~4.0" "symfony/console": "~3.0|~4.0"
}, },
"conflict": {
"symfony/yaml": "<3.4"
},
"require-dev": { "require-dev": {
"symfony/yaml": "~3.4|~4.0", "symfony/yaml": "~3.4|~4.0",
"phpunit/phpunit": "^6.0" "phpunit/phpunit": "^6.0"