From ab13ed4f491a41b2001b26df3c52e979c1469fb7 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Tue, 1 Sep 2015 17:52:18 +0200
Subject: [PATCH] fixed composer.json

---
 src/Symfony/Component/Security/composer.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json
index e323fc70d3..aeda867f03 100644
--- 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