l10n daemon script fcf8980577 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"		2020-01-21 06:17:31 +01:00
..
contents	i18n fixes	2019-11-21 09:24:10 +01:00
Messages.sh	add Messages.sh in shell and containments	2019-11-20 12:35:14 +05:30
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-01-21 06:17:31 +01:00