shift-shell/quicksettings/nightcolor/package
l10n daemon script c3ee2fe339 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"
2025-08-05 01:37:48 +00:00
..
contents/ui Port nightcolor to declarative type registration 2025-04-20 18:02:19 +02:00
metadata.json SVN_SILENT made messages (.desktop file) - always resolve ours 2025-08-05 01:37:48 +00:00