shift-shell/containments/homescreens/folio/package
l10n daemon script fd5eb22a09 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-09-25 01:47:37 +00:00
..
contents folio/appdrawer: fix app drawer button behaviour 2022-09-24 21:10:31 +00:00
metadata.json SVN_SILENT made messages (.desktop file) - always resolve ours 2022-09-25 01:47:37 +00:00