shift-shell/containments/homescreen/package
l10n daemon script 9cf37ea66c 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-02-11 01:46:47 +00:00
..
contents homescreen: Fix broken binding 2022-01-03 01:14:17 -05:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2022-02-11 01:46:47 +00:00