shift-shell/containments/panel/package
l10n daemon script c6089a7b92 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-23 05:29:59 +01:00
..
contents remove translations of signal strength 2019-11-22 14:52:49 +05:30
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-23 05:29:59 +01:00