Fixed merge conflict.
This commit is contained in:
parent
fd380e37a9
commit
316eacb83b
@ -24,17 +24,11 @@
|
||||
"doctrine/orm": ">=2.2"
|
||||
},
|
||||
"suggest": {
|
||||
<<<<<<< HEAD
|
||||
"symfony/form": ">=2.1",
|
||||
"symfony/validator": ">=2.1"
|
||||
}
|
||||
=======
|
||||
"symfony/form": ">=2.0",
|
||||
"symfony/validator": ">=2.0"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-0": { "Symfony\\Bridge\\Doctrine": "" }
|
||||
},
|
||||
"target-dir": "Symfony/Bridge/Doctrine"
|
||||
>>>>>>> 2.0
|
||||
}
|
||||
|
Reference in New Issue
Block a user