l10n daemon script 7764de0470 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"		2018-01-06 04:52:25 +01:00
..
CMakeLists.txt
slide.cpp
slide.h
slide.kcfg
slide_config.cpp
slide_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-01-06 04:52:25 +01:00
slide_config.h
slide_config.ui
slideconfig.kcfgc