TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Readd services

Browse Source
This commit is contained in:
Benjamin Perche
2014-07-08 13:59:13 +02:00
parent 2b19d1fe33
commit df0ba3676c
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/lib/Thelia/Config/Resources/config.xml
View File

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