shift-shell/initialstart/modules/prepare/package
l10n daemon script 4d29b0f0ac 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"
2023-12-22 02:13:13 +00:00
..
contents/ui initialstart: Add dark mode switch 2023-11-08 23:22:26 -08:00
metadata.json SVN_SILENT made messages (.desktop file) - always resolve ours 2023-12-22 02:13:13 +00:00