l10n daemon script 98583160cb 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"		2015-08-28 10:20:30 +00:00
..
contents	Fix shader example	2014-05-01 21:25:13 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-28 10:20:30 +00:00