fixed composer.json

2015-09-01 17:52:18 +02:00 · 2015-09-01 17:52:18 +02:00 · ab13ed4f49
parent 73a31966ea
commit ab13ed4f49
1 changed files with 0 additions and 3 deletions
--- a/src/Symfony/Component/Security/composer.json
+++ b/src/Symfony/Component/Security/composer.json
@ -1,4 +1,3 @@
-<<<<<<< Local Changes
 {
    "name": "symfony/security",
    "type": "library",
@ -57,5 +56,3 @@
        }
    }
 }
-=======
->>>>>>> External Changes