l10n daemon script aa009cfd85 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"		2024-06-09 01:17:55 +00:00
..
contents/ui	Unset file transfer tooltip location	2024-06-07 21:57:24 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-06-09 01:17:55 +00:00