plasma-framework/examples/applets/nowplaying
l10n daemon script f47f98da0b 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-09-28 05:58:18 +02:00
..
contents/qml plasma-framework: Convert copyright statements to SPDX expressions 2020-08-13 19:08:54 +00:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-28 05:58:18 +02:00