summaryrefslogtreecommitdiffstats
path: root/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
diff options
context:
space:
mode:
Diffstat (limited to 'Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java')
-rw-r--r--Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java12
1 files changed, 0 insertions, 12 deletions
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
}
});