From 06803548fa19e9628dcae43d415d134bca13a301 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 21 Mar 2021 09:12:18 +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 6c3d6a9b8..a7cfae84e 100644
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -40,6 +40,7 @@ Comment[nl]=Een client voor matrix, het gedecentraliseerde communicatieprotocol
 Comment[nn]=Klient for Matrix, den desentraliserte lynmeldings­protokollen.
 Comment[pl]=Program do obsługi matriksa, rozproszonego protokołu porozumiewania się
 Comment[pt_BR]=Um cliente para o Matrix, o protocolo de comunicação decentralizado
+Comment[sl]=Odjemalec za decentralizirani komunikacijski protokol matrix
 Comment[sv]=En klient för matrix, det decentraliserade kommunikationsprotokollet
 Comment[uk]=Клієнт matrix, децентралізованого протоколу обміну даними
 Comment[x-test]=xxA client for matrix, the decentralized communication protocolxx