shift-shell/containments/homescreen/package
l10n daemon script 3c628b921e 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"
2019-05-20 05:39:37 +02:00
..
contents Fix launcher icon alignment 2019-02-24 12:22:31 +03:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-05-20 05:39:37 +02:00