Repository navigation
docs(learnings): drop two stray diff3 base markers - #3352
Merged
Merged
Conversation
vybe
approved these changes
Oct 7, 2026
vybe
left a comment
vybe
left a comment
Contributor
There was a problem hiding this comment.
Trivial: removes two stray diff3 markers.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Two bare
||||||| 6b0ddd965lines sat at entry boundaries indocs/memory/learnings.md(lines 1013 and 1026 ondev), left by two merges on 2026-09-23 (#2980 and the ent#596 PR). The surrounding conflict halves had been resolved; only the base marker lines survived. No heading is duplicated, nothing else changes, and no other conflict marker exists in the repo.Found by the merge train (#3349).
🤖 Generated with Claude Code