From 5c9d3909fa472f515e1fb19eaa7d9d7b62c20c7b Mon Sep 17 00:00:00 2001
From: Benjamin Perche <bperche9@gmail.com>
Date: Tue, 8 Jul 2014 16:07:57 +0200
Subject: [PATCH] =?UTF-8?q?Restore=20=09modifi=C3=A9:=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.?=
 =?UTF-8?q?php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php b/core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
index bba78c6b2..285dd1de4 100644
--- a/core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
+++ b/core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
@@ -11,16 +11,17 @@
 /*************************************************************************************/
 
 namespace Thelia\Core\FileFormat\Formatting;
-use Propel\Runtime\ActiveQuery\Criteria;
 use Propel\Runtime\ActiveQuery\ModelCriteria;
-use Propel\Runtime\ActiveQuery\ModelJoin;
 use Propel\Runtime\Map\TableMap;
 use Thelia\Core\Translation\Translator;
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
 use Thelia\Model\Map\ProductTableMap;
 >>>>>>> Remove conflicts
+=======
+>>>>>>> Restore
 /**
  * Class FormatterData
  * @package Thelia\Core\FileFormat\Formatting