From 44d6ac35c1f6be70de763d52dab7c91d60fdeadd Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 31 Mar 2023 02:33:03 +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"
---
 quicksettings/docked/metadata.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/quicksettings/docked/metadata.json b/quicksettings/docked/metadata.json
index bc2fadf9..8ea004fb 100644
--- a/quicksettings/docked/metadata.json
+++ b/quicksettings/docked/metadata.json
@@ -1,4 +1,3 @@
-
 {
     "KPackageStructure": "KPackage/GenericQML",
     "KPlugin": {