shift-shell/containments/homescreen/package
l10n daemon script c8419144ad 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-06-18 05:45:52 +02:00
..
contents Revert "Open and close StartupFeedback using KStartupInfo" 2020-05-28 15:58:27 +02:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 05:45:52 +02:00