l10n daemon script b7f6e57eff 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"		2019-01-14 05:39:00 +01:00
..
CMakeLists.txt
effect.cpp
effect.h
kwin-packagestructure-effect.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-14 05:39:00 +01:00