From 1f6c650fdeffdb4dd9d4081f8cc6162cf1e0f220 Mon Sep 17 00:00:00 2001 From: VESSILLER Date: Mon, 15 Jan 2024 14:05:02 +0100 Subject: [PATCH] Fix resolve conflicts --- htdocs/product/class/product.class.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 5358cebaa24..9702397ca77 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -609,15 +609,6 @@ class Product extends CommonObject */ const TYPE_SERVICE = 1; - /** - * Const sell or eat by mandatory id - */ - const SELL_OR_EAT_BY_MANDATORY_ID_NONE = 0; - const SELL_OR_EAT_BY_MANDATORY_ID_SELL_BY = 1; - const SELL_OR_EAT_BY_MANDATORY_ID_EAT_BY = 2; - const SELL_OR_EAT_BY_MANDATORY_ID_SELL_AND_EAT = 3; - - /** * Constructor *