From 482f781b8c8a18ebff6fd4ac922fb0df6f802f4c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 3 Apr 2024 01:15:20 +0000
Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve
 ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
---
 shell/metadata.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shell/metadata.json b/shell/metadata.json
index 6afe97ce..a0fe28ee 100644
--- a/shell/metadata.json
+++ b/shell/metadata.json
@@ -113,6 +113,6 @@
         "Name[zh_TW]": "Plasma 行動",
         "Website": "https://plasma-mobile.org"
     },
-    "X-Plasma-FallbackPackage": "org.kde.plasma.nano",
-    "X-Plasma-APIVersion": "2"
+    "X-Plasma-APIVersion": "2",
+    "X-Plasma-FallbackPackage": "org.kde.plasma.nano"
 }