plasma-framework/templates/qml-plasmoid-with-qml-extension/package
l10n daemon script f65393c68e 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-03-13 05:18:02 +01:00
..
contents/ui Add template for Plasma QML Applet with QML extension 2017-05-19 14:23:13 +02:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-03-13 05:18:02 +01:00