Commit graph

3 commits

Author SHA1 Message Date
l10n daemon script
6835f49d8c 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"
2024-07-18 01:19:02 +00:00
l10n daemon script
a2b773f1db 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"
2024-07-17 01:19:42 +00:00
Devin Lin
0a09d935ac layout-templates: Split out status bar and navigation panel to separate templates
This makes it more modular, and we can use the template in the mobileshellsettings code.
2024-07-15 17:07:26 -04:00