deblan/FOSElasticaBundle
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #59 from merk/configerror

Browse source 
Removed missed merge conflict
This commit is contained in:
Jeremy Mikola 2012-01-03 20:07:32 -08:00
parent 0e0c12c7cf dfe72d8947
commit 094a505d12
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Resources/config/config.xml
View file

@ -11,13 +11,9 @@
<parameter key="foq_elastica.logger.class">FOQ\ElasticaBundle\Logger\ElasticaLogger</parameter>
<parameter key="foq_elastica.data_collector.class">FOQ\ElasticaBundle\DataCollector\ElasticaDataCollector</parameter>
<parameter key="foq_elastica.manager.class">FOQ\ElasticaBundle\Manager\RepositoryManager</parameter>
<<<<<<< HEAD
=======
<parameter key="foq_elastica.elastica_to_model_transformer.collection.class">FOQ\ElasticaBundle\Transformer\ElasticaToModelTransformerCollection</parameter>
>>>>>>> Added finder capability for an index
</parameters>
<services>
<service id="foq_elastica.logger" class="%foq_elastica.logger.class%">