From df0ba3676c03c178b1401ddfb287c2fec872e7d7 Mon Sep 17 00:00:00 2001
From: Benjamin Perche <bperche9@gmail.com>
Date: Tue, 8 Jul 2014 13:59:13 +0200
Subject: [PATCH] Readd services

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

diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index 30968906e..1cda3e289 100644
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -106,6 +106,10 @@
             <argument >%kernel.debug%</argument>
         </service>
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> Readd services
         <!-- The file manager -->
         <service id="thelia.file_manager" class="Thelia\Files\FileManager">
             <argument>%file_model.classes%</argument>
@@ -136,7 +140,10 @@
             <tag name="kernel.event_subscriber"/>
         </service>
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
+=======
+>>>>>>> Readd services
 
         <!-- Archive builders -->
 
@@ -166,6 +173,7 @@
 
         <!-- Formatters -->
         <service id="thelia.manager.formatter_manager" class="Thelia\Core\FileFormat\Formatter\FormatterManager" />
+<<<<<<< HEAD
 <<<<<<< HEAD
     </services>
 >>>>>>> Add archive builder manager and formatter manager services
@@ -202,5 +210,8 @@
 =======
 
 >>>>>>> Fix services
+=======
+
+>>>>>>> Readd services
     </services>
 </config>