diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed merge conflict.

Browse Source
This commit is contained in:
Henrik Westphal 2011-11-02 09:29:19 +01:00
parent fd380e37a9
commit 316eacb83b
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Bridge/Doctrine/composer.json
View File

@ -24,17 +24,11 @@
"doctrine/orm": ">=2.2" "doctrine/orm": ">=2.2"
}, },
"suggest": { "suggest": {
<<<<<<< HEAD
"symfony/form": ">=2.1", "symfony/form": ">=2.1",
"symfony/validator": ">=2.1" "symfony/validator": ">=2.1"
}
=======
"symfony/form": ">=2.0",
"symfony/validator": ">=2.0"
}, },
"autoload": { "autoload": {
"psr-0": { "Symfony\\Bridge\\Doctrine": "" } "psr-0": { "Symfony\\Bridge\\Doctrine": "" }
}, },
"target-dir": "Symfony/Bridge/Doctrine" "target-dir": "Symfony/Bridge/Doctrine"
>>>>>>> 2.0
} }