From b0ab71db5f260d114ed0c3f60b1038db8f974051 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 2 Jul 2012 22:47:19 +0200 Subject: [PATCH] Fix: merge problem --- htdocs/product/class/product.class.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 882cf7266fd..26a0020a6c4 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -141,8 +141,6 @@ class Product extends CommonObject var $oldcopy; - var $oldcopy; - /** * Constructor