From 7ca9fd9dce5f06cef4fed8527f31a6b21df277bd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Sep 2020 03:49:31 +0200
Subject: [PATCH] Fix merge

---
 htdocs/core/tpl/objectline_title.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php
index 375992be60d..1154dd61834 100644
--- a/htdocs/core/tpl/objectline_title.tpl.php
+++ b/htdocs/core/tpl/objectline_title.tpl.php
@@ -59,7 +59,7 @@ if ($this->element == 'supplier_proposal' || $this->element == 'order_supplier'
 }
 
 // VAT
-print '<td class="linecolvat right" style="width: 80px">'
+print '<td class="linecolvat right" style="width: 80px">';
 if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || !empty($conf->global->FACTURE_LOCAL_TAX2_OPTION)) {
 	print $langs->trans('Taxes');
 } else {