From 638320d26200ed17dfbed05b2846ddb6274298e4 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 12 Jul 2022 02:56:44 +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"
---
 krfb/krfb-framebuffer.desktop | 1 -
 1 file changed, 1 deletion(-)

diff --git a/krfb/krfb-framebuffer.desktop b/krfb/krfb-framebuffer.desktop
index ddd01a2..a792107 100644
--- a/krfb/krfb-framebuffer.desktop
+++ b/krfb/krfb-framebuffer.desktop
@@ -3,7 +3,6 @@ Type=ServiceType
 X-KDE-ServiceType=krfb/framebuffer
 
 Comment=Frame Buffer plugins for KRfb
-Comment[bg]=Приставки за фреймбуфер за KRfb
 Comment[bs]=Priključci framebafera za KRfb
 Comment[ca]=Connectors de «framebuffer» per al KRfb
 Comment[ca@valencia]=Connectors de «framebuffer» per a KRfb