Fix merge

2017-09-12 13:53:55 +02:00 · 2017-09-12 13:53:55 +02:00 · 531ebc4c48
commit 531ebc4c48
parent f411476718
1 changed files with 0 additions and 2 deletions
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@ -1554,6 +1554,4 @@ class FactureLigneRec extends CommonInvoiceLine

    }

-=======
->>>>>>> branch '6.0' of git@github.com:Dolibarr/dolibarr.git
 }