shift-shell/containments/panel/package
l10n daemon script c98ed27c73 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-10-10 06:50:31 +02:00
..
contents use showFullScreen() instead of visible=true 2018-02-12 16:37:35 +01:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-10-10 06:50:31 +02:00