fix conflicts

core/lib/Thelia/Core/Template/Loop/Template.php

@@ -23,12 +23,19 @@
 
 namespace Thelia\Core\Template\Loop;
 
+use Propel\Runtime\ActiveQuery\Criteria;
+use Thelia\Core\Security\AccessManager;
+use Thelia\Core\Template\Element\BaseI18nLoop;
 use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;
 
+use Thelia\Core\Template\Element\PropelSearchLoopInterface;
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 
+use Thelia\Model\ModuleQuery;
+
+use Thelia\Module\BaseModule;
 use Thelia\Type;
 use Thelia\Core\Template\TemplateHelper;
 use Thelia\Core\Template\TemplateDefinition;
@@ -65,14 +72,8 @@ class Template extends BaseLoop implements ArraySearchLoopInterface
         );
     }
 
-<<<<<<< HEAD
     public function buildArray() {
         $type = $this->getArg('template-type')->getValue();
-=======
-    public function buildArray()
-    {
-        $type = $this->getArg(template_type);
->>>>>>> cleanmaster
 
         if ($type == 'front-office')
             $templateType = TemplateDefinition::FRONT_OFFICE;

core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php

@@ -23,11 +23,8 @@
 
 namespace Thelia\Core\Template\Smarty\Assets;
 
-<<<<<<< HEAD
 use Thelia\Core\Template\Assets\AsseticHelper;
 use Thelia\Core\Template\TemplateDefinition;
-=======
->>>>>>> cleanmaster
 use Thelia\Tools\URL;
 use Thelia\Core\Template\Assets\AssetManagerInterface;
 
@@ -59,7 +56,6 @@ class SmartyAssetsManager
 
     public function prepareAssets($assets_directory, \Smarty_Internal_Template $template)
     {
-<<<<<<< HEAD
         self::$assetsDirectory = $assets_directory;
 
         $smartyParser = $template->smarty;
@@ -74,9 +70,6 @@ class SmartyAssetsManager
             foreach($templateDirectories[$templateDefinition->getName()] as $key => $directory) {
 
                 $tpl_path = $directory . DS . self::$assetsDirectory;
-=======
-        $tpl_dir = dirname($template->source->filepath);
->>>>>>> cleanmaster
 
                 $asset_dir_absolute_path = realpath($tpl_path);
 

core/lib/Thelia/Core/Template/TemplateHelper.php

@@ -90,7 +90,6 @@ class TemplateHelper
         );
     }
 
-<<<<<<< HEAD
     /**
      * Returns an array which contains all standard template definitions
      */
@@ -114,18 +113,6 @@ class TemplateHelper
         $list = $exclude = array();
 
         $tplIterator = TemplateDefinition::getStandardTemplatesSubdirsIterator();
-=======
-    public function getList($templateType)
-    {
-        $list = $exclude = array();
-
-        if ($templateType == TemplateDefinition::BACK_OFFICE) {
-            $baseDir = THELIA_TEMPLATE_DIR.TemplateDefinition::BACK_OFFICE_SUBDIR;
-        } elseif ($templateType == TemplateDefinition::PDF) {
-            $baseDir = THELIA_TEMPLATE_DIR.TemplateDefinition::PDF_SUBDIR;
-        } else {
-            $baseDir = THELIA_TEMPLATE_DIR.TemplateDefinition::FRONT_OFFICE_SUBDIR;
->>>>>>> cleanmaster
 
         foreach($tplIterator as $type => $subdir) {
 

core/lib/Thelia/Core/Thelia.php

@@ -49,6 +49,7 @@ use Thelia\Config\DefinePropel;
 use Thelia\Core\Template\TemplateDefinition;
 use Thelia\Core\TheliaContainerBuilder;
 use Thelia\Core\DependencyInjection\Loader\XmlFileLoader;
+use Thelia\Model\ConfigQuery;
 use Symfony\Component\Config\FileLocator;
 
 use Propel\Runtime\Propel;
@@ -197,11 +198,6 @@ class Thelia extends Kernel
                         $definition
                     );
 
-<<<<<<< HEAD
-=======
-                    $code = ucfirst($module->getCode());
-
->>>>>>> cleanmaster
                     $loader = new XmlFileLoader($container, new FileLocator($module->getAbsoluteConfigPath()));
                     $loader->load("config.xml");
 

local/config/schema.xml

@@ -58,6 +58,7 @@
       <parameter name="log_created_at" value="true" />
       <parameter name="log_created_by" value="true" />
     </behavior>
+    <behavior name="query_cache" />
   </table>
   <table isCrossRef="true" name="product_category" namespace="Thelia\Model">
     <column name="product_id" primaryKey="true" required="true" type="INTEGER" />