l10n daemon script b7bdc75ff9 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"		2020-09-17 06:15:05 +02:00
..
contents/ui	Rework the battery plugin	2020-08-27 15:04:40 +00:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-17 06:15:05 +02:00