mirror of
https://invent.kde.org/network/kdeconnect-kde.git
synced 2026-09-29 11:12:50 +02:00
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"