Fix conflicts

alicenet · Aug 19, 2022 · 9dd21d0 · 9dd21d0
1 parent 79bfc6c
commit 9dd21d0
Show file tree

Hide file tree

Showing 2 changed files with 3,098 additions and 553 deletions.
diff --git a/bridge/bindings/mapping.go b/bridge/bindings/mapping.go