l10n daemon script 65cf6a89da 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"		2019-05-04 05:57:30 +02:00
..
contents	Prevent password from being visible	2019-02-23 18:32:20 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-05-04 05:57:30 +02:00