fixed wrong merge

fabpot · fabpot · commit e621b6f169e4 · 2012-11-10T09:21:13.000+01:00
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -20,9 +20,7 @@
         "doctrine/common": ">=2.2,<2.4-dev"
     },
     "require-dev": {
-<<<<<<< HEAD
         "symfony/stopwatch": "2.2.*"
-=======
         "symfony/dependency-injection": "2.2.*",
         "symfony/form": "2.2.*",
         "symfony/http-kernel": "2.2.*",
@@ -31,7 +29,6 @@
         "doctrine/data-fixtures": "1.0.*",
         "doctrine/dbal": ">=2.2,<2.4-dev",
         "doctrine/orm": ">=2.2.3,<2.4-dev"
->>>>>>> fabpot/tests-in-components
     },
     "suggest": {
         "symfony/form": "2.2.*",
