l10n daemon script 3b6a392380 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-05-30 01:44:23 +00:00
..
contents/ui	Add a Record QuickSetting	2022-05-30 00:07:52 +00:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-05-30 01:44:23 +00:00