l10n daemon script cd102c92c1 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-02-27 01:54:10 +00:00
..
contents	[shell/updates] Ensure upgrade process has new panel height	2022-02-01 20:40:37 -05:00
Messages.sh	REUSE compliance, add check to CI, drop unused components	2021-12-23 16:02:41 +00:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-02-27 01:54:10 +00:00