l10n daemon script 6341f6619c 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"		2023-10-22 02:34:49 +00:00
..
ui
CMakeLists.txt
hotspotsettings.cpp
kcm_mobile_hotspot.json
Messages.sh