kwin/effects/windowaperture/package
l10n daemon script 26339e6d6c 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"
2017-02-13 05:52:41 +01:00
..
contents/code
CMakeLists.txt
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2017-02-13 05:52:41 +01:00