l10n daemon script 5d55ee4a0c 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-23 02:08:50 +00:00
..
contents	examples/quick-effect: Change license of main.qml	2023-10-18 19:39:14 +03:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-10-23 02:08:50 +00:00
metadata.json.license