Upstream merge conflict — LoopKit/Loop@c2fddb7 #10

Automated weekly upstream probe hit conflicts when merging LoopKit/Loop:dev into feat/AllFeatures.

Upstream commit: c2fddb76a20500bbbd0be5d4133d64382feae689
Subject: Show the development branch warning at most once a week (LoopKit#2525)
Triggered by: upstream-probe.yml (Mondays 06:00 UTC)

Resolve manually:

git checkout feat/AllFeatures
git fetch upstream dev
git merge upstream/dev
# resolve conflicts
git push origin feat/AllFeatures