l10n daemon script ec764e32b6 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-06-30 13:06:15 +00:00
..
contents	add black/whitelist config to videowall	2015-09-29 23:02:41 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-06-30 13:06:15 +00:00