From d1ffd76d47d29f40fe2359fdb7ea1ba16a825a48 Mon Sep 17 00:00:00 2001
From: Philip Beelmann <philip.beelmann@geofabrik.de>
Date: Fri, 28 Apr 2023 12:55:01 +0000
Subject: [PATCH] cleanup

---
 umap/static/umap/locale/de.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/umap/static/umap/locale/de.json b/umap/static/umap/locale/de.json
index 944c1e0c..bac29ccc 100644
--- a/umap/static/umap/locale/de.json
+++ b/umap/static/umap/locale/de.json
@@ -384,8 +384,4 @@
     "Permanent credits background": "Dauerhafte Danksagung im Hintergrund",
     "Select data": "Wähle Daten aus",
     "Will be permanently visible in the bottom left corner of the map": "Wird in der unteren linken Ecke der Karte permanent sichtbar sein"
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> 15a1802 (i18n)