l10n daemon script effe52f65d 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"		2018-01-29 05:06:41 +01: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	2018-01-29 05:06:41 +01:00