chore: resolve conflicts

bitcoin-sv · Nov 20, 2023 · 10a390b · 10a390b
2 parents fdd0fee + 9686ac0
commit 10a390b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum