Files
krfb/framebuffers
l10n daemon script 17e4116248 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"
2020-07-12 09:14:30 +02:00
..