l10n daemon script 6341f6619c 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-10-22 02:34:49 +00:00
..
contents/ui	initialstart: Port to FormCard	2023-09-21 21:02:47 +02:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-10-22 02:34:49 +00:00