diff options
| author | unknown | 2014-05-26 09:47:51 +0200 |
|---|---|---|
| committer | unknown | 2014-05-26 09:47:51 +0200 |
| commit | f06b3f5042c1fdc3873cbb5218f944f2b96ff72f (patch) | |
| tree | 4c9e788fe094a14a98c5bdf5fa9466c6dcbbac6a /Dozentenmodul/src/models | |
| parent | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff) | |
| download | tutor-module-f06b3f5042c1fdc3873cbb5218f944f2b96ff72f.tar.gz tutor-module-f06b3f5042c1fdc3873cbb5218f944f2b96ff72f.tar.xz tutor-module-f06b3f5042c1fdc3873cbb5218f944f2b96ff72f.zip | |
ddd
Diffstat (limited to 'Dozentenmodul/src/models')
| -rw-r--r-- | Dozentenmodul/src/models/Links.java | 6 |
1 files changed, 2 insertions, 4 deletions
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 } |