plasma-framework/templates/plasma-wallpaper/package
l10n daemon script 24193527bf 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-11 04:56:36 +02:00
..
contents Add a kapptemplate for Plasma Wallpaper 2016-08-05 16:02:14 +02:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2017-08-11 04:56:36 +02:00