l10n daemon script 0c32010a28 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-07-06 05:30:08 +02:00
..
contents/ui	[applet] Port to Kirigami.PlaceholderMessage	2020-04-22 22:49:26 +00:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-07-06 05:30:08 +02:00