fixed bad merge

2018-05-21 12:48:22 +02:00 · 2018-05-21 12:48:22 +02:00 · f2419ddda6
commit f2419ddda6
parent 4d8a71d321
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
@ -142,7 +142,6 @@ class ConfigurationTest extends TestCase
        ));
    }

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