diff options
Diffstat (limited to 'Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java')
| -rw-r--r-- | Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index 3c93b46f..1d7a80eb 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -445,9 +445,7 @@ public class EditLectureLink_GUI extends JFrame { Links.openFAQ(); -<<<<<<< HEAD -======= - faq = Links.getFAQ(); + /*faq = Links.getFAQ(); try { @@ -456,7 +454,7 @@ public class EditLectureLink_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } ->>>>>>> 5d24cdec4d239f473ee2359493ab47d1ef3273dd + */ } }); |