Commit graph

2 commits

Author SHA1 Message Date
l10n daemon script
c71737436e 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-04-05 02:36:13 +00:00
Devin Lin
fe7a453ddd lookandfeel: Rename folder to be have a consistent name with other shells 2023-04-02 19:58:41 -07:00
Renamed from look-and-feel/metadata.json (Browse further)