kwin/effects/dimscreen/package
l10n daemon script 8d005caaae 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"
2018-11-20 05:41:21 +01:00
..
contents/code
CMakeLists.txt
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-11-20 05:41:21 +01:00