Resolve beads.jsonl merge conflict

Browse Source

Amp-Thread-ID: https://ampcode.com/threads/T-4b293f18-1d0a-41bf-932e-d65bc134fcfe
Co-authored-by: Amp <amp@ampcode.com>

...

This commit is contained in:

Steve Yegge

2025-11-05 01:07:32 -08:00

parent ca14127698

commit 183add96cc

1 changed files with 48 additions and 48 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

96

.beads/beads.jsonl

File diff suppressed because one or more lines are too long