l10n daemon script e8d2bfe884 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"		2016-11-04 09:46:15 +00:00
..
contents	asctivity switch anim from desktop shell	2016-10-05 16:59:07 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-11-04 09:46:15 +00:00