Chore: Resolve merge conflict in settings

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
This commit is contained in:
Andymick
2026-07-20 16:23:05 +01:00
co-authored by Claude Haiku 4.5

Diff Content Not Available