l10n daemon script 0f09f20ed3 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-08-16 05:34:53 +02:00
..
CMakeLists.txt
scale.cpp
scale.h
scale.kcfg
scale_config.cpp
scale_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-08-16 05:34:53 +02:00
scale_config.h
scale_config.ui
scaleconfig.kcfgc