kwin/effects/fullscreen/package
l10n daemon script de4e429aed 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-10-06 06:04:18 +02:00
..
contents/code
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-10-06 06:04:18 +02:00