From dfe72d8947ea2dfb994ca6f908fc4b132240cbde Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Wed, 4 Jan 2012 11:16:00 +1100
Subject: [PATCH] Fixed config.xml

---
 Resources/config/config.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Resources/config/config.xml b/Resources/config/config.xml
index 48d322a..ba9627f 100644
--- a/Resources/config/config.xml
+++ b/Resources/config/config.xml
@@ -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%">