l10n daemon script 90306f5c08 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"		2019-01-06 05:42:41 +01:00
..
CMakeLists.txt
resize.cpp	Remove Qt module declarations in includes	2018-06-05 18:07:23 +01:00
resize.h
resize.kcfg
resize_config.cpp
resize_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-06 05:42:41 +01:00
resize_config.h
resize_config.ui
resizeconfig.kcfgc