shift-shell/initialstart/modules/systemnavigation
l10n daemon script 37a1aefed3 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-03-12 01:31:07 +00:00
..
contents/ui initialstart: Add system navigation module 2025-03-06 14:40:43 +00:00
metadata.json SVN_SILENT made messages (.desktop file) - always resolve ours 2025-03-12 01:31:07 +00:00