l10n daemon script 7391459e8f 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-10-15 10:01:47 +00:00
..
contents	run the anim before running the app	2016-09-02 17:43:23 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-10-15 10:01:47 +00:00