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"
2021-03-13 06:41:47 +01:00 · 2021-03-13 06:41:47 +01:00 · 5ea3e44705
commit 5ea3e44705
parent a75da62f4d
1 changed files with 0 additions and 1 deletions
--- a/plugins/connectivity-report/kdeconnect_connectivity_report.json
+++ b/plugins/connectivity-report/kdeconnect_connectivity_report.json
@ -1,4 +1,3 @@
-
 {
    "KPlugin": {
        "Authors": [