From d6c4cfeb74949bcd2047c591e9b5198c4b2b9590 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 19 Jun 2019 05:21:30 +0200
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/scripts/helloqml/metadata.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop
index 03ebcbaeb..4e28bd4d1 100644
--- a/src/scripts/helloqml/metadata.desktop
+++ b/src/scripts/helloqml/metadata.desktop
@@ -3,7 +3,7 @@ Name=Hello Qml
 Name[ca]=Hola Qml
 Name[ca@valencia]=Hola Qml
 Name[cs]=Ahoj QML
-Name[de]=Hallo QML“
+Name[de]=Hallo QML
 Name[en_GB]=Hello QML
 Name[es]=Hola Qml
 Name[fi]=Hei QML