Resolve merge conflict - accept remote

Browse Source

...

This commit is contained in:

Steve Yegge

2025-10-31 12:32:49 -07:00

parent 2e72823277 0c908f1fd5

commit 97f4bf0e2f

1 changed files with 215 additions and 157 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

.beads/beads.jsonl

+215 -157

File diff suppressed because one or more lines are too long