l10n daemon script 008a22b6d9 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-01-30 02:03:12 +00:00
..
contents/ui	Record quicksettings: Move metadata.json to right location	2023-01-19 18:33:02 +01:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-01-30 02:03:12 +00:00