shift-shell/containments/homescreen/package
l10n daemon script 08cc1d8754 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"
2018-08-30 05:50:59 +02:00
..
contents homescreen: Fix ellipsis in i18n string 2017-12-19 13:20:35 +03:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-08-30 05:50:59 +02:00