From 3922cd51ab4112d6fb5fa679e06e4d7d17dad8af Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 29 Jul 2021 01:15:23 +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/nightcolor/metadata.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quicksettings/nightcolor/metadata.desktop b/quicksettings/nightcolor/metadata.desktop
index 391d7c17..02d814b8 100644
--- a/quicksettings/nightcolor/metadata.desktop
+++ b/quicksettings/nightcolor/metadata.desktop
@@ -6,6 +6,7 @@ Name[en_GB]=Night Colour
 Name[es]=Color nocturno
 Name[eu]=Gaueko kolorea
 Name[fr]=Couleur de nuit
+Name[ko]=야간 색상
 Name[nl]=Nachtkleur
 Name[pt]=Cor Nocturna
 Name[pt_BR]=Cor noturna