shift-shell/containments/homescreens/halcyon/package
l10n daemon script 1fec8612dc 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-11-20 01:50:06 +00:00
..
contents/ui homescreens/halcyon: Improve gridview scrolling performance 2022-11-13 22:17:48 -05:00
metadata.json SVN_SILENT made messages (.desktop file) - always resolve ours 2022-11-20 01:50:06 +00:00