Skip to content

docs(changelog): remove a stray merge marker left by #1524 - #1535

Merged
Gerrrt merged 1 commit into
mainfrom
docs/changelog-stray-marker
Nov 16, 2026
Merged

Gerrrt merged 1 commit into
mainfrom
docs/changelog-stray-marker

Conversation

@Gerrrt

@Gerrrt Gerrrt commented Nov 16, 2026

Copy link
Copy Markdown
Owner

A diff3 base marker, '||||||| 96c10c4', was committed between two 2026-11-15 entries. Only the marker line goes; no entry text was lost or changed.

What changed

Why

Blast radius

  • No change to network segmentation or firewall rules
  • No new port published to a VLAN that could not already reach the service
  • No credential added outside secrets/*.sops.yaml

Verification

  • make validate passes
  • Deployed to the lab and confirmed working
  • Docs updated (docs/, service README, or docs/roadmap.md)

A diff3 base marker, '||||||| 96c10c4', was committed between two
2026-11-15 entries. Only the marker line goes; no entry text was lost
or changed.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Copilot AI balanced review requested due to automatic review settings November 16, 2026 09:57
@Gerrrt
Gerrrt enabled auto-merge (squash) November 16, 2026 09:57

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Approval recommended

There are no active review issues blocking the changelog cleanup.

No open issues 🎉

What changed in this PR

Removes a stray merge-conflict marker left by #1524 from the changelog. No entry text or lab behavior changes.

Changes:

  • Deletes ||||||| 96c10c4c between two 2026-11-15 entries.
File Description
docs/​changelog.md Removes the leftover diff3 base marker.

Review effort: Balanced

@Gerrrt
Gerrrt merged commit fb60a53 into main Nov 16, 2026
9 checks passed
@Gerrrt
Gerrrt deleted the docs/changelog-stray-marker branch November 16, 2026 10:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants