diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index c88d98c00ea..858661c6557 100644
--- 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
 }