mirror of
https://invent.kde.org/network/krfb
synced 2024-07-01 07:24:29 +00: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" |
||
---|---|---|
.. | ||
pipewire | ||
qt | ||
xcb | ||
CMakeLists.txt |