l10n daemon script af97d4476c 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-09-08 12:50:45 +00:00
..
contents/ui	Fix, the enum values were renamed	2015-06-24 20:57:17 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-09-08 12:50:45 +00:00