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"
Kst-plot · Oct 17, 2019 · 71f36b8 · 71f36b8
1 parent 2e05bb1
commit 71f36b8
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/kst/kst2.desktop b/src/kst/kst2.desktop
@@ -24,6 +24,7 @@ Name[nl]=Kst2
 Name[pl]=Kst2
 Name[pt]=Kst2
 Name[pt_BR]=Kst2
+Name[ru]=Kst2
 Name[sk]=Kst2
 Name[sv]=Kst2
 Name[uk]=Kst2