From 76d533df909c3be8aeba3e135c44f0e15f18b65c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 2 Jul 2021 01:11:12 +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"
---
 examples/developerguide/basic/metadata.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/examples/developerguide/basic/metadata.desktop b/examples/developerguide/basic/metadata.desktop
index 4005513eb..b815bbcf3 100644
--- a/examples/developerguide/basic/metadata.desktop
+++ b/examples/developerguide/basic/metadata.desktop
@@ -4,6 +4,7 @@ Comment[ar]=تطبيق أساسيّ
 Comment[az]=Əsas Tətbiqlər
 Comment[ca]=Aplicació bàsica
 Comment[ca@valencia]=Aplicació bàsica
+Comment[cs]=Základní aplikace
 Comment[da]=Basal app
 Comment[de]=Einfache Anwendung
 Comment[en_GB]=Basic App