l10n daemon script d2051d6517 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-11-03 06:16:23 +01:00
..
dbusutils_p.h
kwin-runner-windows.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-11-03 06:16:23 +01:00
org.kde.krunner1.xml
windowsrunnerinterface.cpp
windowsrunnerinterface.h