shift-shell/layout-templates/org.kde.plasma.mobile.defaultNavigationPanel
l10n daemon script efb518c817 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"
2025-04-27 01:31:31 +00:00
..
contents layout-templates: Split out status bar and navigation panel to separate templates 2024-07-15 17:07:26 -04:00
metadata.json SVN_SILENT made messages (.desktop file) - always resolve ours 2025-04-27 01:31:31 +00:00