diff options
| author | unknown | 2014-04-22 09:30:05 +0200 |
|---|---|---|
| committer | unknown | 2014-04-22 09:30:05 +0200 |
| commit | 36853c6042e849fd7470f9a12cb8cbd46263de0b (patch) | |
| tree | a412736716a44713cc2b83216036249ef2b17fed /Dozentenmodulserver/src | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module (diff) | |
| download | tutor-module-36853c6042e849fd7470f9a12cb8cbd46263de0b.tar.gz tutor-module-36853c6042e849fd7470f9a12cb8cbd46263de0b.tar.xz tutor-module-36853c6042e849fd7470f9a12cb8cbd46263de0b.zip | |
fds
Diffstat (limited to 'Dozentenmodulserver/src')
| -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; } |