l10n daemon script 4df8d73fc4 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-02-25 02:07:07 +00:00
..
contents/code	effects: Drop legacy EffectsHandler::desktopChanged overloads	2023-02-07 18:10:52 +02:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-02-25 02:07:07 +00:00