l10n daemon script f18deb69f1 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-06-09 09:19:42 +02:00
..
declarative-plugin	Merge branch 'Plasma/5.18'	2020-05-06 15:15:42 +02:00
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-09 09:19:42 +02:00
CMakeLists.txt
decorationmodel.cpp
decorationmodel.h
kcm.cpp
kcm.h
kwindecoration.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-09 09:19:42 +02:00
kwindecorationsettings.kcfg
kwindecorationsettings.kcfgc
Messages.sh
utils.cpp
utils.h
window-decorations.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-09 09:19:42 +02:00