diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-09-01 17:52:18 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-09-01 17:52:18 +0200 |
| commit | cbeb4cecfc7efa6aae465a83b02e943545140fbf (patch) | |
| tree | cf29c07af3b487c411d63ceeab2225d193d7f4aa | |
| parent | ece05f250cc6fb74eb56c031c76403b3273ad245 (diff) | |
| download | symfony-security-cbeb4cecfc7efa6aae465a83b02e943545140fbf.zip symfony-security-cbeb4cecfc7efa6aae465a83b02e943545140fbf.tar.gz symfony-security-cbeb4cecfc7efa6aae465a83b02e943545140fbf.tar.bz2 | |
fixed composer.json
| -rw-r--r-- | composer.json | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/composer.json b/composer.json index e323fc7..aeda867 100644 --- a/composer.json +++ b/composer.json @@ -1,4 +1,3 @@ -<<<<<<< Local Changes { "name": "symfony/security", "type": "library", @@ -57,5 +56,3 @@ } } } -======= ->>>>>>> External Changes |