From 2e80ed8de5d98d12a6db9c5b29a20d53b71748e3 Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Mon, 4 Nov 2013 14:58:03 +0100
Subject: [PATCH] // Cleaned conflict

---
 modules/blocknewproducts/blocknewproducts.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/modules/blocknewproducts/blocknewproducts.php b/modules/blocknewproducts/blocknewproducts.php
index 640233513..8c431d5bc 100644
--- a/modules/blocknewproducts/blocknewproducts.php
+++ b/modules/blocknewproducts/blocknewproducts.php
@@ -145,8 +145,7 @@ class BlockNewProducts extends Module
 	{
 		$this->_clearCache('blocknewproducts.tpl');
 	}
-<<<<<<< HEAD
-	
+
 	public function renderForm()
 	{
 		$fields_form = array(
@@ -215,6 +214,3 @@ class BlockNewProducts extends Module
 		);
 	}
 }
-=======
-}
->>>>>>> d49c4cf62e1919c66dc46a4161cb8045153092c8