l10n daemon script 19793b9492 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-02-23 05:48:12 +01:00
..
contents	[autotests] Test window open/close animations	2018-12-14 21:11:42 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-02-23 05:48:12 +01:00