Fix resolve conflicts
This commit is contained in:
parent
1a164eece5
commit
1f6c650fde
1 changed files with 0 additions and 9 deletions
|
|
@ -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
|
||||
*
|
||||
|
|
|
|||
Loading…
Reference in a new issue