l10n daemon script 87d58643a2 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"		2020-03-17 10:05:04 +01:00
..
contents/ui	[applet] Standardize presentation on the "devices unavailable" view	2020-03-15 19:53:53 +00:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-03-17 10:05:04 +01:00