From 973a2ede9769a48d7b8783cf51b62c7f6c96c2f3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 10 Aug 2023 11:35:19 +0200 Subject: [PATCH] Fix syntax error --- htdocs/core/modules/propale/doc/pdf_azur.modules.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index 878c8d6cef0..e5e2adf4947 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -1478,19 +1478,10 @@ class pdf_azur extends ModelePDFPropales if ($this->emetteur->logo) { $logodir = $conf->mycompany->dir_output; -<<<<<<< HEAD - if (! empty($conf->mycompany->multidir_output[$object->entity])) $logodir = $conf->mycompany->multidir_output[$object->entity]; - if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO)) - { - $logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small; - } - else { -======= if (!empty($conf->mycompany->multidir_output[$object->entity])) $logodir = $conf->mycompany->multidir_output[$object->entity]; if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO)) { $logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small; } else { ->>>>>>> branch '10.0' of git@github.com:Dolibarr/dolibarr.git $logo = $logodir.'/logos/'.$this->emetteur->logo; } if (is_readable($logo))