fix merge. the acl is not automatically included in symfony/symfony in 3.0

Tobion · Tobion · commit b28689054b7d · 2015-10-30T16:05:41.000+01:00
diff --git a/composer.json b/composer.json
@@ -20,7 +20,6 @@
         "doctrine/common": "~2.4",
         "twig/twig": "~1.20|~2.0",
         "psr/log": "~1.0",
-        "symfony/security-acl": "~2.7",
         "symfony/polyfill-intl-icu": "~1.0",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/polyfill-php54": "~1.0",
