From a2bb64354baa08a3288f0b953a86f00013e1b6b3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 5 Feb 2020 14:56:01 +0100 Subject: [PATCH] Fix bad merge --- htdocs/core/modules/facture/doc/pdf_sponge.modules.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php index 20506c637ee..60d4650921b 100644 --- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php @@ -651,16 +651,11 @@ class pdf_sponge extends ModelePDFFactures else { // We found a page break -<<<<<<< HEAD - $showpricebeforepagebreak = 0; -======= - // Allows data in the first page if description is long enough to break in multiples pages if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) $showpricebeforepagebreak = 1; else $showpricebeforepagebreak = 0; ->>>>>>> branch '11.0' of git@github.com:Dolibarr/dolibarr.git } } else // No pagebreak