fix conflict
This commit is contained in:
commit
091b8269a6
@ -99,7 +99,6 @@ class AccountingAccount extends CommonObject
|
|||||||
var $active; // duplicate with status
|
var $active; // duplicate with status
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
*
|
*
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user