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_en.arb
+++ b/lib/l10n/app_en.arb
@@ -409,7 +409,6 @@
        "description": "Location text"
    },

-<<<<<<< HEAD
    "sendfile": "Send file to server",
    "@sendfile": {
        "description": "Send file to server button"
@@ -418,7 +417,8 @@
    "pickfile": "Pick file",
    "@pickfile": {
        "description": "Pick file button"
-=======
+    },
+    
    "placedata": "Placedata",
    "@camdata": {
        "description": "view data placedata header"
@@ -427,7 +427,6 @@
    "sent": "Sent",
    "@sent": {
        "description": "view data sent header"
->>>>>>> d6ae86598dd9d031af9fe29680dc050c5bb2946f
    }

 }