kwin/effects/logout/package
l10n daemon script 7f398af180 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-07-15 05:21:01 +02:00
..
contents/code
CMakeLists.txt
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-15 05:21:01 +02:00