l10n daemon script 2f6e9a6355 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"		2020-03-27 06:43:00 +01:00
..
CMakeLists.txt
effect.cpp	Update my email address	2020-01-14 18:17:18 +02:00
effect.h	Update my email address	2020-01-14 18:17:18 +02:00
kwin-packagestructure-effect.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-03-27 06:43:00 +01:00