l10n daemon script 6d0b1b3edc 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-11-24 04:13:56 +01:00
..
contents	close panel when an applet wants to close	2016-10-05 18:03:41 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-11-24 04:13:56 +01:00