From 316eacb83b2dcf4feead2939f4ff71362a2e00ed Mon Sep 17 00:00:00 2001
From: Henrik Westphal <westphal@secure-net-concepts.de>
Date: Wed, 2 Nov 2011 09:29:19 +0100
Subject: [PATCH] Fixed merge conflict.

---
 src/Symfony/Bridge/Doctrine/composer.json | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
index 4d2fb294f1..5886dafe98 100644
--- 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
 }