From c692d7e679018f48176cd0d8027df04a99ffa24b Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 3 Dec 2023 02:06:11 +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/neochat.notifyrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/neochat.notifyrc b/src/neochat.notifyrc
index aa3676062..63a0d2e2e 100644
--- a/src/neochat.notifyrc
+++ b/src/neochat.notifyrc
@@ -117,7 +117,7 @@ Name[sk]=Nová správa
 Name[sl]=Novo sporočilo
 Name[sv]=Nytt meddelande
 Name[ta]=புதிய செய்தி
-Name[tr]=Yeni ileti
+Name[tr]=Yeni İleti
 Name[uk]=Нове повідомлення
 Name[x-test]=xxNew messagexx
 Name[zh_CN]=新消息