l10n daemon script 954151ca97 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"		2021-10-31 01:14:25 +00:00
..
data
CMakeLists.txt
main.cpp
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-10-31 01:14:25 +00:00
startupfeedback.cpp
startupfeedback.h