l10n daemon script d5573b51ac 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"		2018-08-27 05:46:19 +02:00
..
contents/ui	Enable running commands from the plasmoid	2018-07-27 08:11:03 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-08-27 05:46:19 +02:00