l10n daemon script cea4b7faeb 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"		2015-05-15 10:25:45 +00:00
..
CMakeLists.txt
dashboard.cpp
dashboard.h
dashboard.kcfg
dashboard_config.cpp
dashboard_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-05-15 10:25:45 +00:00
dashboard_config.h
dashboard_config.ui
dashboardconfig.kcfgc