From fb54eaa656499fdc330d6d511b73167af6d0c2c4 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 5 Apr 2020 06:09:05 +0200
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"
---
 agents/archivemailagent/akonadi_archivemail_agent.notifyrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agents/archivemailagent/akonadi_archivemail_agent.notifyrc b/agents/archivemailagent/akonadi_archivemail_agent.notifyrc
index 4e294afdd..294005b00 100644
--- a/agents/archivemailagent/akonadi_archivemail_agent.notifyrc
+++ b/agents/archivemailagent/akonadi_archivemail_agent.notifyrc
@@ -203,7 +203,7 @@ Name[gl]=O directorio non existe
 Name[hu]=A könyvtár nem létezik
 Name[ia]=Le directorio non existe
 Name[it]=La cartella non esiste
-Name[ko]=디렉터리 서비스가 존재하지 않음
+Name[ko]=디렉터리가 없음
 Name[nb]=Mappa finnes ikke
 Name[nds]=Gifft Orner nich
 Name[nl]=Map bestaat niet