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"
2026-07-01 07:31:16 -07:00 · 2019-05-25 05:26:01 +02:00
parent c05707884c
commit 77f5ae8230
3 changed files with 1 additions and 5 deletions
--- a/events/xdp/krfb_events_xdp.json
+++ b/events/xdp/krfb_events_xdp.json
@@ -13,4 +13,3 @@
        "Website": "http://www.kde.org"
    }
 }
-