From 531ebc4c481f90aac36637aaff98b4608e18f5c2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Sep 2017 13:53:55 +0200 Subject: [PATCH] Fix merge --- htdocs/compta/facture/class/facture-rec.class.php | 2 -- 1 file changed, 2 deletions(-) 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 }