:)

1 files changed, 17 insertions, 12 deletions

diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java
index 3a2cfdbd..9a8c92fc 100644
--- a/Dozentenmodulserver/src/sql/SQL.java
+++ b/Dozentenmodulserver/src/sql/SQL.java
@@ -447,7 +447,7 @@ public class SQL {
 		return -1;

 	}

 	

-<<<<<<< HEAD
+
 

 	/**

 	 * 

@@ -466,12 +466,18 @@ public class SQL {
 			

 			System.out.println("delete image");

 			

-			stm.executeUpdate("DELETE * FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '"+id+"' " +

-					"and imageVersion = '"+version+"' ;");

+			stm.executeUpdate("DELETE FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '"+id+"' " +

+					"AND imageVersion = '"+version+"';");

 			

 			return true;

-			

-=======
+		} catch (SQLException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+			return false;

+		}

+		

+	 }

+			
 	public int updateLectureData(Connection con, int pk_person, int pk_image,

 			int imageversion, String name, String desc, String shortdesc,

 			String start, String end, boolean isactive, String id) {

@@ -516,19 +522,18 @@ public class SQL {
 					+ pk_person + "');");

 			con.commit();

 

->>>>>>> 0c626844e491923e61657f5483586b9a2a3f6bb8
+
 		} catch (SQLException e) {

 			// TODO Auto-generated catch block

 			e.printStackTrace();

 		}

-<<<<<<< HEAD
+
 		

-		return false;

-	}

-

-=======
+		//return false;

+	//}

+
 		return 0;

 

 	}

->>>>>>> 0c626844e491923e61657f5483586b9a2a3f6bb8
+
 }