Fix merge
This commit is contained in:
parent
f411476718
commit
531ebc4c48
@ -1554,6 +1554,4 @@ class FactureLigneRec extends CommonInvoiceLine
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> branch '6.0' of git@github.com:Dolibarr/dolibarr.git
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user