l10n daemon script 64658c9d37 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-16 09:09:19 +01:00
..
CMakeLists.txt
zoom.cpp
zoom.h
zoom.kcfg
zoom_config.cpp
zoom_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-16 09:09:19 +01:00
zoom_config.h
zoom_config.ui
zoomconfig.kcfgc