l10n daemon script dadcc76841 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"		2017-08-06 06:02:06 +02:00
..
contents/ui	Gave plasmoid some love	2017-08-02 01:57:01 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-06 06:02:06 +02:00