From 1f99e0994805ce51082aae76b11caac37b5090ee Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 13 Nov 2021 01:28:37 +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/airplanemode/metadata.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quicksettings/airplanemode/metadata.desktop b/quicksettings/airplanemode/metadata.desktop
index 58b83f97..d4863d8c 100644
--- a/quicksettings/airplanemode/metadata.desktop
+++ b/quicksettings/airplanemode/metadata.desktop
@@ -9,6 +9,7 @@ Name[fi]=Lentokonetila
 Name[fr]=Mode Avion
 Name[hu]=Repülős üzemmód
 Name[ia]=Modo aeroplano
+Name[ko]=비행기 모드
 Name[nl]=Vliegtuigmodus
 Name[nn]=Flymodus
 Name[pa]=ਏਅਰਪਲੇਨ ਮੋਡ