From 6fddb75ef54bb218119f03121b217a721cdddf89 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 19 Dec 2016 21:36:15 +0100
Subject: [PATCH] Fix merge

---
 src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
index 1f244f9f44..2143747ad9 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
+++ b/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" />