From 7212513034b1181cc8efd439bb3ccde5481a3ecd Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 11 Jun 2025 01:35:45 +0000
Subject: 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"
---
 src/org.kde.dolphin.desktop | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/org.kde.dolphin.desktop')

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index c114295ec..98c7cae26 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -141,6 +141,7 @@ Comment[ia]=Gere tu files
 Comment[is]=Hafðu umsjón með skránum þínum
 Comment[it]=Gestisci i tuoi file
 Comment[ka]=მართეთ თქვენი ფაილები
+Comment[ko]=내 파일 관리
 Comment[nl]=Uw bestanden beheren
 Comment[pl]=Zarządzaj swoimi plikami
 Comment[sl]=Upravlja vaše datoteke
-- 
cgit v1.3