l10n daemon script 69bc07498d 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"		2017-06-20 04:32:58 +02: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	2017-06-20 04:32:58 +02:00