diff options
Diffstat (limited to 'Dozentenmodulserver/src/server/ServerHandler.java')
| -rw-r--r-- | Dozentenmodulserver/src/server/ServerHandler.java | 3 |
1 files changed, 0 insertions, 3 deletions
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; } |