shift-shell/containments/homescreen/package
l10n daemon script 9b98493232 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"
2020-01-20 06:01:38 +01:00
..
contents Initial splashscreen rework (!31) 2019-12-20 12:15:18 +05:30
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-01-20 06:01:38 +01:00