merge

2024-04-24 17:49:55 +02:00
parent e3609deb5f
commit 3f61b740b8
4 changed files with 3 additions and 106 deletions
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -85,11 +85,8 @@
    "open": "öffnen",
    "date": "Datum",
    "location": "Standort",
-<<<<<<< HEAD
    "sendfile": "Datei zum Server schicken",
-    "pickfile": "Datei auswählen"
-=======
+    "pickfile": "Datei auswählen",
    "placedata": "Standortdaten",
    "sent": "Gesendet"
->>>>>>> d6ae86598dd9d031af9fe29680dc050c5bb2946f
 }