l10n daemon script 0dfa399b7b 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-09-25 01:24:12 +00:00
..
contents/ui	Remove import versions from networkmanager imports	2023-09-24 20:47:29 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-09-25 01:24:12 +00:00