Merge branch '4.1'

* 4.1: fixed bad merge
2018-05-21 12:48:51 +02:00 · 2018-05-21 12:48:51 +02:00 · 00f25ee8f7
commit 00f25ee8f7
parent 1f4100d635 f9183db863
1 changed files with 0 additions and 1 deletions
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@ -144,7 +144,6 @@ class ConfigurationTest extends TestCase
        ));
    }

->>>>>>> 3.4
    public function testAssetsCanBeEnabled()
    {
        $processor = new Processor();