Fixed merge conflict.

2011-11-02 09:29:19 +01:00 · 2011-11-02 09:29:19 +01:00 · 316eacb83b
commit 316eacb83b
parent fd380e37a9
1 changed files with 0 additions and 6 deletions
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@ -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
 }