l10n daemon script cc7fac30e8 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-03-11 02:59:39 +00:00
..
contents	shell/configuration: fix applet	2023-03-06 22:25:42 +01:00
Messages.sh	REUSE compliance, add check to CI, drop unused components	2021-12-23 16:02:41 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-03-11 02:59:39 +00:00
metadata.json.license	shell: Convert desktop file to JSON	2022-07-21 19:30:11 +00:00