l10n daemon script 73abdf7a13 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"		2022-06-16 01:55:13 +00:00
..
package/ui	Use spdx syntax for all files	2021-05-27 15:01:00 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-06-16 01:55:13 +00:00