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"
2020-01-09 05:47:13 +01:00 · 2020-01-09 05:47:13 +01:00 · f2da5f98f3
parent 40a5491026
commit f2da5f98f3
1 changed files with 1 additions and 0 deletions
--- a/org.kde.keysmith.desktop
+++ b/org.kde.keysmith.desktop
@ -5,6 +5,7 @@ Name[cs]=Keysmith
 Name[en_GB]=Keysmith
 Name[es]=Keysmith
 Name[et]=Keysmith
+Name[fi]=Keysmith
 Name[fr]=Keysmith
 Name[it]=Keysmith
 Name[nl]=Keysmith