fixed bad merge
This commit is contained in:
parent
f521c11097
commit
1a8003e8fa
@ -17,12 +17,7 @@
|
||||
],
|
||||
"minimum-stability": "dev",
|
||||
"require": {
|
||||
<<<<<<< HEAD
|
||||
"php": ">=5.5.9"
|
||||
=======
|
||||
"php": ">=5.3.9",
|
||||
"symfony/polyfill-apcu": "~1.1"
|
||||
>>>>>>> 2.8
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/finder": "~2.8|~3.0"
|
||||
|
Reference in New Issue
Block a user