From 25a6f69bca3276135c6ab2d578e2127a715a2f85 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 1 Dec 2023 01:16:07 +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" --- plasmoid-kf6/package/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plasmoid-kf6/package/metadata.json b/plasmoid-kf6/package/metadata.json index aefeb0e97..ddedf393d 100644 --- a/plasmoid-kf6/package/metadata.json +++ b/plasmoid-kf6/package/metadata.json @@ -113,11 +113,11 @@ "Website": "https://albertvaka.wordpress.com" }, "X-Plasma-API": "declarativeappletscript", + "X-Plasma-API-Minimum-Version": "6.0", "X-Plasma-ConfigPlugins": [ "kcm_kdeconnect" ], "X-Plasma-MainScript": "ui/main.qml", - "X-Plasma-API-Minimum-Version": "6.0", "X-Plasma-NotificationArea": "true", "X-Plasma-NotificationAreaCategory": "Hardware" }