From 90bb52eb330428650bbe2836182ca3afab3a16b0 Mon Sep 17 00:00:00 2001
From: Jeremy Mikola <jmikola@gmail.com>
Date: Tue, 3 Jan 2012 20:07:32 -0800
Subject: [PATCH] Merge pull request #59 from merk/configerror

Removed missed merge conflict
---
 Resources/config/config.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/config/config.xml b/Resources/config/config.xml
index ca1642b..6de1443 100644
--- a/Resources/config/config.xml
+++ b/Resources/config/config.xml
@@ -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%">