l10n daemon script cfd296326b 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-10-23 05:33:32 +02:00
..
CMakeLists.txt
desktopgrid.cpp
desktopgrid.h
desktopgrid.kcfg
desktopgrid_config.cpp
desktopgrid_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-23 05:33:32 +02:00
desktopgrid_config.h
desktopgrid_config.ui
desktopgridconfig.kcfgc
main.qml