l10n daemon script 7eee223dfc 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-03-02 05:46:53 +01:00
..
contents/ui	[Plasmoid]Make device menu use PC ContextMenu	2020-02-21 11:42:31 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-03-02 05:46:53 +01:00