l10n daemon script 204acee273 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-05 01:20:23 +00:00
..
contents/ui	Make the phoneshell a bit more flexible	2021-08-31 17:23:20 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-10-05 01:20:23 +00:00