l10n daemon script 10dbdac20a 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-07-19 01:21:05 +00:00
..
contents/ui	initialstart: Use distro name	2023-11-05 21:27:44 -08:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-07-19 01:21:05 +00:00