8000 fixed merge issue · symfony/symfony@620744f · GitHub
[go: up one dir, main page]
Skip to content

Commit 620744f

Browse files
fabpotfabpot
committed
fixed merge issue
1 parent 30935c7 commit 620744f

File tree

1 file changed

+0
-1
lines changed
  • src/Symfony/Bundle/TwigBundle/Resources/config

1 file changed

+0
-1
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
<service id="twig.app_variable" class="Symfony\Bridge\Twig\AppVariable" public="false">
4141
<call method="setEnvironment"><argument>%kernel.environment%</argument></call>
4242
<call method="setDebug"><argument>%kernel.debug%</argument></call>
43-
<call method="setContainer"><argument type="service" id="service_container" /></call>
4443
<call method="setTokenStorage"><argument type="service" id="security.token_storage" on-invalid="ignore" /></call>
4544
<call method="setRequestStack"><argument type="service" id="request_stack" on-invalid="ignore" /></call>
4645
</service>

0 commit comments

Comments
 (0)
0