l10n daemon script 9d78e17e42 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-02 01:17:46 +00:00
..
contents/ui	[DeviceDelegate] Improve interaction with overflow menu	2021-07-23 20:42:22 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-09-02 01:17:46 +00:00