l10n daemon script b0a2b69a2d 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-10-20 06:05:01 +02:00
..
CMakeLists.txt
effect.cpp
effect.h
kwin-packagestructure-effect.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-20 06:05:01 +02:00