l10n daemon script cca4b38058 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"		2021-09-25 02:15:02 +00:00
..
contents/ui	Add airplane mode in quicksettings	2021-09-16 09:19:47 +00:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-09-25 02:15:02 +00:00