From f0816260c5e19c1d0828ad2db6cdd3a72a24f294 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 29 Dec 2024 01:30:36 +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"
---
 org.kde.neochat.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop
index 257743c16..1ad1faead 100644
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -97,6 +97,7 @@ Comment[ca]=Xat a Matrix
 Comment[ca@valencia]=Xat a Matrix
 Comment[de]=Über Matrix unterhalten
 Comment[en_GB]=Chat on Matrix
+Comment[eo]=Babilo en Matrix
 Comment[es]=Chat en Matrix
 Comment[eu]=Berriketa Matrix-en
 Comment[fi]=Keskustele Matrixissä