Fix merge

This commit is contained in:
Robin Chalas 2017-08-30 01:36:56 +02:00
parent a4021e6bb0
commit edb8c33f35

View File

@ -72,14 +72,14 @@
<service id="Symfony\Bundle\FrameworkBundle\Command\TranslationDebugCommand"> <service id="Symfony\Bundle\FrameworkBundle\Command\TranslationDebugCommand">
<argument type="service" id="translator" /> <argument type="service" id="translator" />
<argument type="service" id="translation.loader" /> <argument type="service" id="translation.reader" />
<argument type="service" id="translation.extractor" /> <argument type="service" id="translation.extractor" />
<tag name="console.command" command="debug:translation" /> <tag name="console.command" command="debug:translation" />
</service> </service>
<service id="Symfony\Bundle\FrameworkBundle\Command\TranslationUpdateCommand"> <service id="Symfony\Bundle\FrameworkBundle\Command\TranslationUpdateCommand">
<argument type="service" id="translation.writer" /> <argument type="service" id="translation.writer" />
<argument type="service" id="translation.loader" /> <argument type="service" id="translation.reader" />
<argument type="service" id="translation.extractor" /> <argument type="service" id="translation.extractor" />
<argument>%kernel.default_locale%</argument> <argument>%kernel.default_locale%</argument>
<tag name="console.command" command="translation:update" /> <tag name="console.command" command="translation:update" />