l10n daemon script 24564244ed 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"		2024-10-06 01:21:57 +00:00
..
contents/ui	Virtual Monitor: Replace the video-monitor icon with something that exists	2024-08-05 23:07:01 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-10-06 01:21:57 +00:00