l10n daemon script 0898ee2e80 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"		2022-02-09 01:48:59 +00:00
..
contents/ui	panel: Refactor panel and implement blue ocean mockups	2021-12-22 23:29:00 +00:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-02-09 01:48:59 +00:00