shift-shell/containments/homescreens/halcyon/package
l10n daemon script af8ef4f9f8 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-13 02:37:20 +00:00
..
contents/ui homescreens/halcyon: Add new homescreen 2022-06-08 18:09:35 -04:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2022-06-13 02:37:20 +00:00