shift-shell/containments/panel/package
l10n daemon script 78ce668071 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-11-20 05:40:05 +01:00
..
contents remove useless debug 2019-10-22 13:38:07 +02:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-20 05:40:05 +01:00