symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
+6-4Lines changed: 6 additions & 4 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
+6-4Lines changed: 6 additions & 4 deletions
@@ -27,16 +27,18 @@
             <argument type="service" id="request_stack" />
         </service>
 
-<<<<<<< HEAD
         <service id="templating.helper.router" class="Symfony\Bundle\FrameworkBundle\Templating\Helper\RouterHelper">
             <tag name="templating.helper" alias="router" />
             <argument type="service" id="router" />
         </service>
 
+        <service id="templating.helper.assets" class="Symfony\Bundle\FrameworkBundle\Templating\Helper\AssetsHelper">
+            <tag name="templating.helper" alias="assets" />
+            <argument /> <!-- default package -->
+            <argument type="collection" /> <!-- named packages -->
+        </service>
+
         <service id="templating.helper.actions" class="Symfony\Bundle\FrameworkBundle\Templating\Helper\ActionsHelper">
-=======
-        <service id="templating.helper.actions" class="%templating.helper.actions.class%">
->>>>>>> 2.8
             <tag name="templating.helper" alias="actions" />
             <argument type="service" id="fragment.handler" />
         </service>