From 47abbd3eb2865907d098e97ac1d68adc707d49a6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Oct 2018 14:23:36 +0200
Subject: [PATCH] Fix bad merge

---
 htdocs/core/actions_massactions.inc.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index cb77489d397..696e1135ca9 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1017,16 +1017,6 @@ if (! $error && ($massaction == 'delete' || ($action == 'delete' && $confirm ==
 				}
 			}
 
-			if (in_array($objecttmp->element, array('societe','member'))) $result = $objecttmp->delete($objecttmp->id, $user, 1);
-			else $result = $objecttmp->delete($user);
-			if ($result <= 0)
-			{
-				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-				$error++;
-				break;
-			}
-			else $nbok++;
-
 			if (in_array($objecttmp->element, array('societe','member'))) $result = $objecttmp->delete($objecttmp->id, $user, 1);
 			else $result = $objecttmp->delete($user);