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"
2 years ago · b7dc3e3698
parent 1e726457e9
commit b7dc3e3698
1 changed files with 1 additions and 1 deletions
--- a/src/plugins/kscreen/metadata.json
+++ b/src/plugins/kscreen/metadata.json
@ -58,7 +58,7 @@
        "Name[et]": "Kscreen",
        "Name[eu]": "Kscreen",
        "Name[fi]": "KScreen",
-        "Name[fr]": "Kscreen",
+        "Name[fr]": "KScreen",
        "Name[hu]": "Kscreen",
        "Name[ia]": "Kscreen",
        "Name[id]": "KScreen",