Fix merge

This commit is contained in:
Nicolas Grekas 2016-12-19 21:36:15 +01:00
parent be710237a7
commit 6fddb75ef5

View File

@ -47,8 +47,6 @@
<service id="twig.loader.chain" class="Twig_Loader_Chain" public="false"/>
<service id="twig.loader" alias="twig.loader.filesystem" />
<service id="twig.extension.profiler" class="Symfony\Bridge\Twig\Extension\ProfilerExtension" public="false">
<argument type="service" id="twig.profile" />
<argument type="service" id="debug.stopwatch" on-invalid="null" />