Upstream merge conflict — LoopKit/Loop@e322927

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

Upstream commit: e3229270a2704a601ef69ed3f407195717d5b09e
Subject: Warn at launch on development (dev branch) builds (LoopKit#2439)
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