From 48f40a2e6cd0853216c9d0e719b0eead33cda901 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Thu, 8 Aug 2013 10:38:26 +0200
Subject: [PATCH] fix conflict on config.xml file

---
 core/lib/Thelia/Config/Resources/config.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index 549195207..bc3cb5341 100755
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -33,14 +33,10 @@
 
         <form name="thelia.customer.login" class="Thelia\Form\CustomerLogin"/>
         <form name="thelia.admin.login" class="Thelia\Form\AdminLogin"/>
-<<<<<<< HEAD
 
         <form name="thelia.admin.category.creation" class="Thelia\Form\CategoryCreationForm"/>
         <form name="thelia.admin.category.deletion" class="Thelia\Form\CategoryDeletionForm"/>
-
-=======
         <form name="thelia.cart.add" class="Thelia\Form\CartAdd"/>
->>>>>>> cart
     </forms>