Merge pull request #59 from merk/configerror

Removed missed merge conflict
This commit is contained in:
Jeremy Mikola 2012-01-03 20:07:32 -08:00 committed by Richard Miller
parent 0d0c653777
commit 90bb52eb33

View file

@ -14,7 +14,6 @@
<parameter key="foq_elastica.elastica_to_model_transformer.collection.class">FOQ\ElasticaBundle\Transformer\ElasticaToModelTransformerCollection</parameter>
</parameters>
<services>
<service id="foq_elastica.logger" class="%foq_elastica.logger.class%">