From: rettenbe <rettenbe@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 12 Nov 2008 13:32:58 +0000 (+0000)
Subject: delete conflict ">>>>>>>"
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d0ff77b13e20c3d6532dfe9f7f028af771d8327e;p=gosa.git

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 cfb2542ee..1bf9728c3 100755
--- 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 {