From 00dbee23b779220c66e31f08011d87a7bd8c1824 Mon Sep 17 00:00:00 2001
From: Dominik Pfennig <dominik@suma-ev.de>
Date: Wed, 11 May 2016 14:01:22 +0200
Subject: [PATCH] Vergessener Merge Commit

---
 resources/lang/en/fokiNames.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/resources/lang/en/fokiNames.php b/resources/lang/en/fokiNames.php
index faa4bb90d..a7e8fcc4f 100644
--- a/resources/lang/en/fokiNames.php
+++ b/resources/lang/en/fokiNames.php
@@ -1,19 +1,10 @@
 <?php
 
 return [
-<<<<<<< HEAD
 	'web' 		=>	"web",
 	'news'		=>	"nachrichten",
 	'science'	=>	'wissenschaft',
 	'shopping'	=>	'produktsuche',
 	'picture'	=>	'bilder',
 	'custom'	=>	'angepasst'
-=======
-	'web' 			=>	"web",
-	'nachrichten'	=>	"news",
-	'wissenschaft'	=>	'science',
-	'produktsuche'	=>	'shopping',
-	'bilder'		=>	'picture',
-	'angepasst'		=>	'custom'
->>>>>>> eeeca90b0d782d61bf3a095b6816645f862cd896
 ];
\ No newline at end of file
-- 
GitLab