l10n daemon script d830f41cc3 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-11-07 06:30:51 +01:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-11-07 06:30:51 +01:00