l10n daemon script 9af31e8024 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-06-29 10:30:43 +00:00
..
contents/code	Adding a video wall script	2012-02-21 22:27:35 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-06-29 10:30:43 +00:00