fixed previous merge

2012-01-05 14:55:00 +01:00 · 2012-01-05 14:55:00 +01:00 · 85a5f1533b
commit 85a5f1533b
parent 7000e944fd
1 changed files with 0 additions and 26 deletions
--- a/src/Symfony/Bundle/DoctrineBundle/composer.json
+++ b/src/Symfony/Bundle/DoctrineBundle/composer.json
@ -1,26 +0,0 @@
-{
-    "name": "symfony/doctrine-bundle",
-    "type": "symfony-bundle",
-    "description": "Symfony DoctrineBundle",
-    "keywords": [],
-    "homepage": "http://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "http://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.2",
-        "symfony/doctrine-bridge": "self.version"
-    },
-    "autoload": {
-        "psr-0": { "Symfony\\Bundle\\DoctrineBundle": "" }
-    },
-    "target-dir": "Symfony/Bundle/DoctrineBundle"
-}