ddd

17 files changed, 2 insertions, 16 deletions

diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class
index e1dc0068..101eeca5 100644
--- a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class
+++ b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
index de05d0ec..7f37814b 100644
--- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class
index e2ae84dc..aea7cc9d 100644
--- a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class
+++ b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class
index 225b1b06..e67f41d5 100644
--- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class
+++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class
diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class
index be70d58b..5b2e2f61 100644
--- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class
+++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class
diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
index 38bd1e7f..6e81b472 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 24613829..41128bc8 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 13e86cff..cb5966d1 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 eec06e78..4a9e9a0f 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 db7cd89e..f2c03ce9 100644
--- a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class
index c5ce2396..2957775c 100644
--- a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class
+++ b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class
diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class
index 15823f5c..e804c5fa 100644
--- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class
+++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class
diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class
index 1d7ed4b2..80671923 100644
--- a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class
+++ b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class
diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class
index c5d4f8cf..959ba420 100644
--- a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class
+++ b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class
diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class
index e4b4f646..e5a83ed6 100644
--- a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class
+++ b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class
diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
index 3c93b46f..65960c81 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
@@ -445,18 +445,6 @@ public class EditLectureLink_GUI extends JFrame {
 				
 				Links.openFAQ();
 				
-<<<<<<< HEAD
-=======
-				faq = Links.getFAQ();
-
-				try {
-				
-					Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq );
-				} catch (IOException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
->>>>>>> 5d24cdec4d239f473ee2359493ab47d1ef3273dd
 			}
 		});
 
diff --git a/Dozentenmodul/src/models/Links.java b/Dozentenmodul/src/models/Links.java
index 860cae35..5490f3ad 100644
--- a/Dozentenmodul/src/models/Links.java
+++ b/Dozentenmodul/src/models/Links.java
@@ -19,8 +19,7 @@ public class Links {
 	public static String getOTRS() {
 		return OTRS;
 	}
-	
-<<<<<<< HEAD
+
 	public static void openFAQ() {
 		
 		String faq = FAQ;
@@ -98,7 +97,7 @@ public static void openOTRS() {
 		} 
 
 	}
-=======
+
 	public static String getUriWindows() {
 		return uriWindows;
 	}
@@ -107,5 +106,4 @@ public static void openOTRS() {
 		return uriLinux;
 	}
 	
->>>>>>> 5d24cdec4d239f473ee2359493ab47d1ef3273dd
 }