1 files changed, 16 insertions, 1 deletions
diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java
index c3abd69c..e8fbb0d6 100644
--- a/Dozentenmodulserver/src/server/ServerHandler.java
+++ b/Dozentenmodulserver/src/server/ServerHandler.java
@@ -201,7 +201,7 @@ public class ServerHandler implements Server.Iface {
 			XMLCreator xml=new XMLCreator(con, name);
 			try {
 				xml.create(name);
-				System.out.println("creator durch");
+				System.out.println(new Date() + " - Creator beendet");
 			} catch (SQLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -303,5 +303,20 @@ public class ServerHandler implements Server.Iface {
 
 		return null;
 	}
+<<<<<<< HEAD
 	
+=======
+
+
+	@Override
+	public boolean updateLecturedata(String name, String newName,
+			String shortdesc, String desc, String startDate, String endDate,
+			boolean isActive, String imagename, String firstname,
+			String lastname, String university, String Mail, String Tel,
+			String Fak, String id) throws TException {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+>>>>>>> 0c626844e491923e61657f5483586b9a2a3f6bb8
 }