From d57b410c0447b8a516896d81ba243fd573e8d24e Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 14 Mar 2021 10:23:37 +0100
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 +
 1 file changed, 1 insertion(+)

diff --git a/neochat.notifyrc b/neochat.notifyrc
index 52726d2ce..3226fb80b 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -30,6 +30,7 @@ Comment[ca]=Un client per al Matrix, el protocol de comunicacions descentralitza
 Comment[ca@valencia]=Un client per al Matrix, el protocol de comunicacions descentralitzat
 Comment[en_GB]=A client for matrix, the decentralised communication protocol
 Comment[es]=Un cliente para Matrix, el protocolo de comunicaciones descentralizado
+Comment[eu]=Matrix, deszentralizatutako komunikazio protokolorako, bezero bat
 Comment[fi]=Hajautetun Matrix-viestintäyhteyskäytännön asiakasohjelma
 Comment[fr]=Un client pour « Matrix », le protocole décentralisé de communications.
 Comment[ia]=Un cliente per matrix, le protocollo de communication decentralisate