From 4ed20886c0edea66aff938342657bb7808ed5df9 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 11 Jul 2025 01:34:44 +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"
---
 .../waydroidintegrationplugin/kauth/waydroidhelper.actions      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/waydroidintegrationplugin/kauth/waydroidhelper.actions b/components/waydroidintegrationplugin/kauth/waydroidhelper.actions
index 89dbac6d..24b9a38c 100644
--- a/components/waydroidintegrationplugin/kauth/waydroidhelper.actions
+++ b/components/waydroidintegrationplugin/kauth/waydroidhelper.actions
@@ -10,4 +10,4 @@ Name=Initialize Waydroid
 Description=Allow initialization of Waydroid
 Policy=yes
 PolicyInactive=yes
-Persistence=session
\ No newline at end of file
+Persistence=session