From 0fae2ba8ca98897bc7d4d24e60b963d47709994e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Fri, 29 Dec 2017 20:41:39 +0100
Subject: [PATCH] correct merge

---
 htdocs/contact/list.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 4ef343c3c02..6e62cef1eb0 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -498,15 +498,6 @@ if (! empty($arrayfields['p.firstname']['checked']))
 	print '<input class="flat" type="text" name="search_firstname" size="6" value="'.dol_escape_htmltag($search_firstname).'">';
 	print '</td>';
 }
-<<<<<<< HEAD
-if (! empty($arrayfields['p.poste']['checked']))
-{
-	print '<td class="liste_titre">';
-	print '<input class="flat" type="text" name="search_poste" size="5" value="'.dol_escape_htmltag($search_poste).'">';
-	print '</td>';
-}
-=======
->>>>>>> branch '6.0' of git@github.com:Dolibarr/dolibarr.git
 if (! empty($arrayfields['p.zip']['checked']))
 {
 	print '<td class="liste_titre">';