l10n daemon script e94f3ba475 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"		2021-04-21 01:18:53 +00:00
..
package	update dock settings CheckBoxes properly	2021-02-06 14:13:08 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-04-21 01:18:53 +00:00