Skip to content

fix: resolve merge conflict markers in README - #17

Merged
0xLeif merged 1 commit into
mainfrom
fix/readme-merge-conflicts
Mar 19, 2026
Merged

fix: resolve merge conflict markers in README#17
0xLeif merged 1 commit into
mainfrom
fix/readme-merge-conflicts

Conversation

@corvid-agent

Copy link
Copy Markdown
Collaborator

Summary

  • Removes merge conflict markers (<<<<<<<, =======, >>>>>>>) left in README.md after PR docs: add GitHub Pages documentation site #15 was merged
  • CLI Reference code block cleaned up (commands/flags are already in tables below)
  • GitHub Action description combined from both versions

🤖 Generated with Claude Code

Two conflict blocks from the docs PR merge were left in the file.
Cleaned up CLI Reference code block and GitHub Action description.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@0xLeif
0xLeif merged commit 2648836 into main Mar 19, 2026
7 checks passed
@0xLeif
0xLeif deleted the fix/readme-merge-conflicts branch March 19, 2026 01:39
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