fds

37 files changed, 0 insertions, 3 deletions

diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
index adc80d24..e429fcd8 100644
--- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
index 957d3f55..495ab5ca 100644
--- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
+++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class
index 2262e784..d9f847f2 100644
--- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class
+++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
index 8b947c81..bd2d50f5 100644
--- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
+++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
index 5523e2be..5713f420 100644
--- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
index db67b896..39a39cf6 100644
--- a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class
index c68e6ef2..7d7a7f76 100644
--- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class
+++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class
diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class
index aa0a9cfc..ce80a79e 100644
--- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class
+++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class
diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class
index 58cf5620..086bb79b 100644
--- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class
+++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class
diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class
index c4efc823..3d77a286 100644
--- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class
+++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class
diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class
index f99560c5..412270c8 100644
--- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class
+++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class
diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class
index 3d8e7bff..296870d2 100644
--- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class
+++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class
diff --git a/Dozentenmodulserver/bin/server/Server$Client.class b/Dozentenmodulserver/bin/server/Server$Client.class
index c08af073..bea48810 100644
--- a/Dozentenmodulserver/bin/server/Server$Client.class
+++ b/Dozentenmodulserver/bin/server/Server$Client.class
diff --git a/Dozentenmodulserver/bin/server/Server$Iface.class b/Dozentenmodulserver/bin/server/Server$Iface.class
index afebb403..a908be4f 100644
--- a/Dozentenmodulserver/bin/server/Server$Iface.class
+++ b/Dozentenmodulserver/bin/server/Server$Iface.class
diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class
index d916c517..e142efa8 100644
--- a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class
+++ b/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class
diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class
index b94e0ecf..2bb16fbd 100644
--- a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class
+++ b/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class
diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class b/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class
index eeba0c8a..d09d485e 100644
--- a/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class
+++ b/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class
diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class
index d2cd2f01..678f7c84 100644
--- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class
+++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class
diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class
index ec24272b..a19e9b11 100644
--- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class
+++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class
diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class
index 5fb2eba8..af69ff26 100644
--- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class
+++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class
diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class
index 6af0f321..c444db47 100644
--- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class
+++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class
diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class
index db472ea2..e519676a 100644
--- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class
+++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class
diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class
index f628c4af..96a81981 100644
--- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class
+++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class
diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class
index b06f283d..d1a6d223 100644
--- a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class
+++ b/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class
diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class
index 4203b887..25d94dd1 100644
--- a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class
+++ b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class
diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class
index eb90e829..02d9e93f 100644
--- a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class
+++ b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class
diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class
index 6ad1a6e4..3d6763a4 100644
--- a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class
+++ b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class
diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class
index 4aa8b01a..148a6e64 100644
--- a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class
+++ b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class
diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result.class b/Dozentenmodulserver/bin/server/Server$getImageList_result.class
index b7094af7..146adf05 100644
--- a/Dozentenmodulserver/bin/server/Server$getImageList_result.class
+++ b/Dozentenmodulserver/bin/server/Server$getImageList_result.class
diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class
index 43510383..e4edca25 100644
--- a/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class
+++ b/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class
diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class
index 983d9fcc..214ac4c6 100644
--- a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class
+++ b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class
diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class
index 18a6654f..7aca2397 100644
--- a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class
+++ b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class
diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class
index 2bc46013..7f2c9003 100644
--- a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class
+++ b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class
diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class
index e2d9f4c3..13d1e40e 100644
--- a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class
+++ b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class
diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result.class
index e3ae6197..777adc95 100644
--- a/Dozentenmodulserver/bin/server/Server$getLectureList_result.class
+++ b/Dozentenmodulserver/bin/server/Server$getLectureList_result.class
diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class
index 5ad3583e..7882e473 100644
--- a/Dozentenmodulserver/bin/server/ServerHandler.class
+++ b/Dozentenmodulserver/bin/server/ServerHandler.class
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;
 	}