From d5188bfe3cdb0722b839274c3029058eab078f73 Mon Sep 17 00:00:00 2001
From: Benjamin Perche <bperche9@gmail.com>
Date: Wed, 2 Jul 2014 14:07:42 +0200
Subject: [PATCH] =?UTF-8?q?Add=20archive=20builder=20manager=20and=20forma?=
 =?UTF-8?q?tter=20manager=20services=20=09modifi=C3=A9:=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20core/lib/Thelia/Config/Resources/config.xml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/lib/Thelia/Config/Resources/config.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index db21517e8..b467a0974 100644
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -135,6 +135,22 @@
         <service id="session.listener" class="Thelia\Core\EventListener\SessionListener">
             <tag name="kernel.event_subscriber"/>
         </service>
+<<<<<<< HEAD
+=======
+
+        <!-- Archive builders and file formatters -->
+
+        <service id="thelia.manager.archive_builder_manager" class="Thelia\Core\FileFormat\Archive\ArchiveBuilderManager">
+            <argument>%kernel.environment%</argument>
+        </service>
+
+        <service id="thelia.manager.zip_archive_builder" class="Thelia\Core\FileFormat\Archive\ArchiveBuilder\ZipArchiveBuilder">
+            <tag name="thelia.manager.archive_builder" />
+        </service>
+
+        <service id="thelia.manager.formatter_manager" class="Thelia\Core\FileFormat\Formatter\FormatterManager" />
+    </services>
+>>>>>>> Add archive builder manager and formatter manager services
 
         <!-- Archive builders -->