From b1fe8e3f2bb1718315145273bed80b0dc60329b3 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Wed, 8 Feb 2017 13:45:42 +0100
Subject: [PATCH] fix merge

---
 htdocs/product/fournisseurs.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 8c389776573..69a9344832b 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -698,6 +698,7 @@ if ($id > 0 || $ref)
 						if ($user->rights->produit->creer || $user->rights->service->creer)
 						{
 							print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$productfourn->fourn_id.'&amp;action=add_price&amp;rowid='.$productfourn->product_fourn_price_id.'">'.img_edit()."</a>";
+							print ' &nbsp; ';
 							print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$productfourn->fourn_id.'&amp;action=ask_remove_pf&amp;rowid='.$productfourn->product_fourn_price_id.'">'.img_picto($langs->trans("Remove"),'disable.png').'</a>';
 						}
 
-- 
GitLab