mirror of
https://github.com/KDE/krfb
synced 2026-07-01 07:31:16 -07:00
f5467f826c
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"