TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore

Browse Source 
modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
This commit is contained in:
Benjamin Perche
2014-07-08 16:07:57 +02:00
parent 7ccb32badb
commit 5c9d3909fa
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
View File

@@ -11,16 +11,17 @@
/*************************************************************************************/ /*************************************************************************************/
namespace Thelia\Core\FileFormat\Formatting; namespace Thelia\Core\FileFormat\Formatting;
use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\ActiveQuery\ModelCriteria; use Propel\Runtime\ActiveQuery\ModelCriteria;
use Propel\Runtime\ActiveQuery\ModelJoin;
use Propel\Runtime\Map\TableMap; use Propel\Runtime\Map\TableMap;
use Thelia\Core\Translation\Translator; use Thelia\Core\Translation\Translator;
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
======= =======
use Thelia\Model\Map\ProductTableMap; use Thelia\Model\Map\ProductTableMap;
>>>>>>> Remove conflicts >>>>>>> Remove conflicts
=======
>>>>>>> Restore
/** /**
* Class FormatterData * Class FormatterData
* @package Thelia\Core\FileFormat\Formatting * @package Thelia\Core\FileFormat\Formatting