From a3b53b32e3345071e6b48674c7809c8bdeae3f31 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 18 May 2018 07:34:05 +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/org.kde.kanagram.desktop | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org.kde.kanagram.desktop b/src/org.kde.kanagram.desktop
index ee867419..847d0ec3 100755
--- a/src/org.kde.kanagram.desktop
+++ b/src/org.kde.kanagram.desktop
@@ -96,7 +96,7 @@ Comment[hi]=केडीई अक्षर अनुक्रम खेल
 Comment[hne]=केडीई अक्छर अनुक्रम खेल
 Comment[hr]=KDE igra premještanja slova
 Comment[hu]=KDE-alapú szókirakó játék
-Comment[id]=Permainan Urutan Huruf KDE
+Comment[id]=Game Urutan Huruf KDE
 Comment[is]=KDE Stafaröðunarleikur
 Comment[it]=Gioco di anagrammi per KDE
 Comment[ja]=KDE 回文ゲーム
@@ -158,7 +158,7 @@ GenericName[hi]=अक्षर अनुक्रम खेल
 GenericName[hne]=अक्छर अनुक्रम खेल
 GenericName[hr]=Igra rasporeda slova
 GenericName[hu]=Szókirakó játék
-GenericName[id]=Permainan Urutan Huruf
+GenericName[id]=Game Urutan Huruf
 GenericName[is]=Stafaröðunarleikur
 GenericName[it]=Gioco di anagrammi
 GenericName[ja]=回文ゲーム