From c83f4b4f75f2186bf170679fdbf6ce6fdfff937c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 10 Apr 2022 01:45:29 +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"
---
 src/plasma-runner-neochat.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/plasma-runner-neochat.desktop b/src/plasma-runner-neochat.desktop
index ff0e0071f..f3a3ad712 100644
--- a/src/plasma-runner-neochat.desktop
+++ b/src/plasma-runner-neochat.desktop
@@ -35,6 +35,7 @@ Name[x-test]=xxNeoChatxx
 Name[zh_CN]=NeoChat
 Comment=Find rooms in NeoChat
 Comment[ar]=اعثر على غرف في نيوتشات
+Comment[az]=NeoChat-da otaqları tapın
 Comment[ca]=Cerca sales en el NeoChat
 Comment[ca@valencia]=Busca sales en NeoChat
 Comment[en_GB]=Find rooms in NeoChat