l10n daemon script 3433b05c97 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-11-04 17:27:21 +00:00
..
contents/code	add "MinimizeAll" script	2015-04-07 23:59:17 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-11-04 17:27:21 +00:00