l10n daemon script 1112188a8b 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-06-10 05:41:19 +02:00
..
CMakeLists.txt
decoration.cpp
decoration.h
kwin-packagestructure-decoration.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-06-10 05:41:19 +02:00