From 5c6a540807641c89d9c4fe0b43c58c3d256bd040 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 14 Jun 2021 01:15: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"
---
 neochat.notifyrc        | 1 +
 org.kde.neochat.desktop | 1 +
 2 files changed, 2 insertions(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index ed48f780b..3fcff1da4 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -20,6 +20,7 @@ Name[pl]=NeoChat
 Name[pt]=NeoChat
 Name[pt_BR]=NeoChat
 Name[ro]=NeoChat
+Name[sk]=NeoChat
 Name[sl]=NeoChat
 Name[sv]=NeoChat
 Name[ta]=நியோச்சாட்
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index 52bcf58aa..d68e48af7 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -21,6 +21,7 @@ Name[pl]=NeoChat
 Name[pt]=NeoChat
 Name[pt_BR]=NeoChat
 Name[ro]=NeoChat
+Name[sk]=NeoChat
 Name[sl]=NeoChat
 Name[sv]=NeoChat
 Name[ta]=நியோச்சாட்