Fixed a rebase error

javiereguiluz · javiereguiluz · commit ab8fa54c5e05 · 2016-11-15T10:50:06.000+01:00
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -1256,81 +1256,6 @@ templating loaders. Templating loaders are used to find and load templates
 from a resource (e.g. a filesystem or database). Templating loaders must
 implement :class:`Symfony\\Component\\Templating\\Loader\\LoaderInterface`.
 
-.. _reference-framework-assets-packages:
-
-packages
-........
-
-You can group assets into packages, to specify different base URLs for them:
-
-.. configuration-block::
-
-    .. code-block:: yaml
-
-        # app/config/config.yml
-        framework:
-            # ...
-            templating:
-                packages:
-                    avatars:
-                        base_urls: 'http://static_cdn.example.com/avatars'
-
-    .. code-block:: xml
-
-        <!-- app/config/config.xml -->
-        <?xml version="1.0" encoding="UTF-8" ?>
-        <container xmlns="http://symfony.com/schema/dic/services"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns:framework="http://symfony.com/schema/dic/symfony"
-            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
-
-            <framework:config>
-
-                <framework:templating>
-
-                    <framework:package
-                        name="avatars"
-                        base-url="http://static_cdn.example.com/avatars">
-
-                </framework:templating>
-
-            </framework:config>
-        </container>
-
-    .. code-block:: php
-
-        // app/config/config.php
-        $container->loadFromExtension('framework', array(
-            // ...
-            'templating' => array(
-                'packages' => array(
-                    'avatars' => array(
-                        'base_urls' => 'http://static_cdn.example.com/avatars',
-                    ),
-                ),
-            ),
-        ));
-
-Now you can use the ``avatars`` package in your templates:
-
-.. configuration-block:: php
-
-    .. code-block:: html+jinja
-
-        <img src="{{ asset('...', 'avatars') }}">
-
-    .. code-block:: html+php
-
-        <img src="<?php echo $view['assets']->getUrl('...', 'avatars') ?>">
-
-Each package can configure the following options:
-
-* :ref:`base_urls <reference-templating-base-urls>`
-* :ref:`version <reference-framework-assets-version>`
-* :ref:`version_format <reference-templating-version-format>`
-
->>>>>>> Cookbook entry: Asset - Custom Version Strategy
 translator
 ~~~~~~~~~~
 
