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"
KDE · May 18, 2018 · a3b53b3 · a3b53b3
1 parent dc20490
commit a3b53b3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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]=回文ゲーム