delete conflict ">>>>>>>"

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@13010 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index cfb2542eec01c7bee4e90dab8de517a23166d700..1bf9728c3d09c4af3c3c5260ea5b54e5b9a47952 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -1014,11 +1014,8 @@ sub update_jobdb_status_for_send_msgs {
                     "SET status='error', result='can not deliver msg, please consult log file' ".
                     "WHERE id=$jobdb_id";
                 my $res = $job_db->update_dbentry($sql_statement);
-<<<<<<< .mine
-=======
                &daemon_log("$session_id DEBUG: $sql_statement", 7);
->>>>>>> .r13007
-            }
+    }
 
         # sending msg was successful
         } else {