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

---
 Dozentenmodul/src/models/Links.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'Dozentenmodul/src/models/Links.java')

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