l10n daemon script 925fabc34c 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-02-16 01:49:48 +00:00
..
contents/ui	quicksettings: Add caffeine quicksetting	2022-02-10 23:20:04 -05:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-02-16 01:49:48 +00:00