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 31, 2019 · 8fb69b3 · 8fb69b3
1 parent 571efd8
commit 8fb69b3
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/org.kde.kjumpingcube.desktop b/org.kde.kjumpingcube.desktop
@@ -130,6 +130,7 @@ Comment[fi]=Alueenvaltauspeli
 Comment[fr]=Jeu de capture de territoires
 Comment[gl]=Xogo de captura de territorios.
 Comment[it]=Gioco di conquista del territorio
+Comment[ko]=땅따먹기 게임
 Comment[nl]=Landverovertjespel
 Comment[nn]=Spel basert på områdekapring
 Comment[pl]=Gra w zajmowanie terytorium