:)

1 files changed, 1 insertions, 3 deletions

diff --git a/Dozentenmodulserver/src/server/Server.java b/Dozentenmodulserver/src/server/Server.java
index 50b25821..da1d424a 100644
--- a/Dozentenmodulserver/src/server/Server.java
+++ b/Dozentenmodulserver/src/server/Server.java
@@ -448,14 +448,13 @@ public class Server {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getLectureData failed: unknown result");
     }
 
-<<<<<<< HEAD
 	public boolean deleteImageData(String imageid, String imageversion) {
 		
 		SQL sql = new SQL();
 		
 		return sql.deleteImage( imageid, imageversion);
 	}
-=======
+
     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 org.apache.thrift.TException
     {
       send_updateLecturedata(name, newName, shortdesc, desc, startDate, endDate, isActive, imagename, firstname, lastname, university, Mail, Tel, Fak, id);
@@ -492,7 +491,6 @@ public class Server {
       }
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateLecturedata failed: unknown result");
     }
->>>>>>> 0c626844e491923e61657f5483586b9a2a3f6bb8
 
   }
   public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface {