Upstream merge conflict — LoopKit/Loop@1f71ec4

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

Upstream commit: 1f71ec4fa94941abdbd72fd5bd914770faa2e90b
Subject: Support use of OmnipodKit (LoopKit#2426)
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

This issue is stale because it has been open for 30 days with no activity.

This issue was closed because it has been inactive for 14 days since being marked as stale.

Navigation Menu