You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
latte-dock/containment/package
l10n daemon script 6c2b5f4971 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"
2 years ago
..
contents plasmatheme:define max background opacity to 1% 3 years ago
metadata.json SVN_SILENT made messages (.desktop file) - always resolve ours 2 years ago