l10n daemon script aa0e574e90 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"		2023-09-26 01:22:52 +00:00
..
contents/ui	Remove photo plugin	2023-09-15 23:04:17 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-09-26 01:22:52 +00:00