From 1bc8035f9473cf056044e84bd395c9f2847760b7 Mon Sep 17 00:00:00 2001
From: Rui Strecht <rui.strecht@aliartalentos.com>
Date: Wed, 18 Apr 2018 10:31:10 +0100
Subject: [PATCH] Fix minor merge issue

---
 htdocs/contact/list.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 08bc1b4a34b..3d1fa3dcaef 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -7,11 +7,8 @@
  * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013       Alexandre Spangaro      <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
-<<<<<<< HEAD
- * Copyright (C) 2018       Nicolas ZABOURI          <info@inovea-conseil.com>
-=======
+ * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2018       Juanjo Menent			<jmenent@2byte.es>
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by