From cb1c9d18693df423b8c30c25fa49a987591b92c6 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 16 Jun 2021 02:24:26 +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 6d567a1a8..768cdf7e6 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -19,6 +19,7 @@ Name[pa]=ਨਿਓ-ਚੈਟ
 Name[pl]=NeoChat
 Name[pt_BR]=NeoChat
 Name[sk]=NeoChat
+Name[sl]=NeoChat
 Name[sv]=NeoChat
 Name[ta]=நியோச்சாட்
 Name[uk]=NeoChat
diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index bc7617540..24b74e46f 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -18,6 +18,7 @@ Name[pa]=ਨਿਓ-ਚੈਟ
 Name[pl]=NeoChat
 Name[pt_BR]=NeoChat
 Name[sk]=NeoChat
+Name[sl]=NeoChat
 Name[sv]=NeoChat
 Name[ta]=நியோச்சாட்
 Name[uk]=NeoChat