latte-dock/indicators/default
l10n daemon script d9217065fe 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"
..
package add CheckBoxesColumn and introduce common margin
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours