From 29809ed777aaa77f2415eb512c1c776d585eadce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Lahmann?= <lahmann@ub.uni-leipzig.de>
Date: Fri, 9 Oct 2020 14:35:40 +0200
Subject: [PATCH] [finc] removed merge conflict remains from ce18d9ef

---
 local/languages/de.ini | 1 -
 local/languages/en.ini | 1 -
 2 files changed, 2 deletions(-)

diff --git a/local/languages/de.ini b/local/languages/de.ini
index f88f78a7259..168d3f107d4 100644
--- a/local/languages/de.ini
+++ b/local/languages/de.ini
@@ -2003,7 +2003,6 @@ Search type = "Suchtyp"
 
 License = "Lizenz"
 
-<<<<<<< HEAD
 ; #17717
 Skip to content = "Zum Inhalt"
 
diff --git a/local/languages/en.ini b/local/languages/en.ini
index fc81295f037..d6af5e6fc28 100644
--- a/local/languages/en.ini
+++ b/local/languages/en.ini
@@ -2098,7 +2098,6 @@ Skip to search = "Skip to search"
 
 License = "License"
 
-<<<<<<< HEAD
 ; #17717
 ; only necessary in en.ini
 skip-to = "Skip to "
-- 
GitLab