shift-shell/containments/homescreens/halcyon/package
l10n daemon script e4f5b54dde 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"
2022-06-20 01:55:01 +00:00
..
contents/ui homescreens/halcyon: Port to new model 2022-06-18 15:42:47 -04:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2022-06-20 01:55:01 +00:00