From f06b3f5042c1fdc3873cbb5218f944f2b96ff72f Mon Sep 17 00:00:00 2001
From: unknown
Date: Mon, 26 May 2014 09:47:51 +0200
Subject: ddd

---
 Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java')

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
 			}
 		});
 
-- 
cgit v1.2.3-55-g7522