l10n daemon script d9f7fc6918 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"		2023-07-27 01:37:50 +00:00
..
contents/ui	Allow disabling clipboard auto-share and add option to share manually	2023-06-07 19:48:25 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-07-27 01:37:50 +00:00