From 36853c6042e849fd7470f9a12cb8cbd46263de0b Mon Sep 17 00:00:00 2001
From: unknown
Date: Tue, 22 Apr 2014 09:30:05 +0200
Subject: fds

---
 Dozentenmodulserver/src/server/ServerHandler.java | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'Dozentenmodulserver/src/server/ServerHandler.java')

diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java
index 14157a61..daf8f4d0 100644
--- a/Dozentenmodulserver/src/server/ServerHandler.java
+++ b/Dozentenmodulserver/src/server/ServerHandler.java
@@ -361,7 +361,6 @@ public class ServerHandler implements Server.Iface {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-<<<<<<< HEAD
 		sql.updateLectureData(con, pk_image, imageversion, lastname, newName, desc, shortdesc, startDate, endDate, isActive, id);
 		
 		XMLCreator xml=new XMLCreator(con, newName);
@@ -373,11 +372,9 @@ public class ServerHandler implements Server.Iface {
 			e.printStackTrace();
 		}
 		
-=======
 		sql.updateLectureData(con, pk_image, imageversion, lastname, newName,
 				desc, shortdesc, startDate, endDate, isActive, id);
 		log.info(new Date() + " - updated LectureData");
->>>>>>> a3c0327dbd49efc29ede542f7093638941a7ae13
 		return false;
 	}
 	
-- 
cgit v1.2.3-55-g7522