docs: remove stray merge markers from backlog.md

Three conflict marker lines (ours, divider, theirs) were committed in an earlier
merge. Both sides are separate items (BL-069 and BL-062 to BL-068), so only the
marker lines are removed. No item text changed.
This commit is contained in:
2026-10-17 14:47:54 -07:00
parent 40827d5371
commit b78b9b3707

View File

@@ -697,7 +697,6 @@ deliberately deferred.
do not show the badge on pages with nothing to sync, and keep it clear of
page controls.
<<<<<<< ours
### BL-069 - The sync has no cap on one run and no last-admin guard
- **Found during:** T13.3 (D18)
@@ -714,7 +713,6 @@ deliberately deferred.
- **Suggested wave or follow-up:** before the first live run, or in T13.6 if
Matt decides. Needs Matt.
=======
## Future build: mobile app and scaling
Logged 2026-10-12 from the meeting with Nick. The answers are in
@@ -816,7 +814,6 @@ boundary"). Do not use `localStorage` as the store of record.
- **Related:** BL-019 (closed) made a stored code that has left the list stay
as an option. Keep that behavior when the list changes.
- **Suggested wave or follow-up:** future wave, after the codes arrive.
>>>>>>> theirs
### BL-070 - Shell scripts get CRLF line endings on Windows, and the backup container cannot start