dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Cleaned conflict

Browse Source
This commit is contained in:
Damien Metzger
2013-11-04 14:58:17 +01:00
parent 5386a4547b
commit 2e80ed8de5
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blocknewproducts/blocknewproducts.php
+1 -5
View File
@@ -145,8 +145,7 @@ class BlockNewProducts extends Module
{ {
$this->_clearCache('blocknewproducts.tpl'); $this->_clearCache('blocknewproducts.tpl');
} }
<<<<<<< HEAD
public function renderForm() public function renderForm()
{ {
$fields_form = array( $fields_form = array(
@@ -215,6 +214,3 @@ class BlockNewProducts extends Module
); );
} }
} }
=======
}
>>>>>>> d49c4cf62e1919c66dc46a4161cb8045153092c8