Fix merge

Author: nicolas-grekas

src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml

@@ -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" />