From 738590890eb33da3d362ca2a81ff1dcedbf5f94c Mon Sep 17 00:00:00 2001 From: aFolletete Date: Tue, 20 Sep 2011 08:38:43 +0000 Subject: [PATCH] // clean conflict lines in SpecificPrice file git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8653 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/SpecificPrice.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/classes/SpecificPrice.php b/classes/SpecificPrice.php index 383d29df6..500c1926e 100644 --- a/classes/SpecificPrice.php +++ b/classes/SpecificPrice.php @@ -68,16 +68,10 @@ class SpecificPriceCore extends ObjectModel public static function getByProductId($id_product) { -<<<<<<< .mine return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' SELECT * FROM `'._DB_PREFIX_.'specific_price` WHERE `id_product` = '.(int)$id_product); -======= - return Db::getInstance()->ExecuteS(' - SELECT * FROM `'._DB_PREFIX_.'specific_price` WHERE `id_product` = '.(int)$id_product - ); ->>>>>>> .r8644 } public static function getIdsByProductId($id_product) @@ -213,11 +207,7 @@ class SpecificPriceCore extends ObjectModel '); $targeted_prices = array(); -<<<<<<< .mine - $last_quantity = NULL; -======= $last_quantity = null; ->>>>>>> .r8644 foreach($res as $specific_price) {