l10n daemon script 006cb7f865 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-02-18 07:54:49 +01:00
..
contents	thumbnail: don't request the window stream until we first need it	2020-12-10 03:49:35 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-02-18 07:54:49 +01:00