From d1a6d55a72e6c1f80168a38b721e83afc7cfb67d Mon Sep 17 00:00:00 2001
From: Benjamin Perche <bperche9@gmail.com>
Date: Fri, 4 Jul 2014 09:29:57 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20services=20=09modifi=C3=A9:=20=20=20=20?=
 =?UTF-8?q?=20=20=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 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index c2561d2f1..30968906e 100644
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -138,7 +138,7 @@
 <<<<<<< HEAD
 =======
 
-        <!-- Archive builders and file formatters -->
+        <!-- Archive builders -->
 
         <service id="thelia.manager.archive_builder_manager" class="Thelia\Core\FileFormat\Archive\ArchiveBuilderManager">
             <argument>%kernel.environment%</argument>
@@ -156,17 +156,17 @@
 
         <!-- tar.gz -->
         <service id="thelia.manager.tar_gz_archive_builder" class="Thelia\Core\FileFormat\Archive\ArchiveBuilder\TarGzArchiveBuilder">
-            <argument id="compressionType" type="string">gz</argument>
             <tag name="thelia.manager.archive_builder" />
         </service>
 
         <!-- tar.bz2 -->
         <service id="thelia.manager.tar_bz2_archive_builder" class="Thelia\Core\FileFormat\Archive\ArchiveBuilder\TarBz2ArchiveBuilder">
-            <argument id="compressionType" type="string">bz2</argument>
             <tag name="thelia.manager.archive_builder" />
         </service>
 
+        <!-- Formatters -->
         <service id="thelia.manager.formatter_manager" class="Thelia\Core\FileFormat\Formatter\FormatterManager" />
+<<<<<<< HEAD
     </services>
 >>>>>>> Add archive builder manager and formatter manager services
 
@@ -199,5 +199,8 @@
         <!-- Formatters -->
         <service id="thelia.manager.formatter_manager" class="Thelia\Core\FileFormat\Formatter\FormatterManager" />
 
+=======
+
+>>>>>>> Fix services
     </services>
 </config>