l10n daemon script c870d13461 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-08-27 02:56:17 +00:00
..
contents/ui	Fix activating existing settings window on Wayland	2022-07-06 12:55:39 +00:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-08-27 02:56:17 +00:00