resolve conflicts

taikoxyz · Dec 13, 2023 · 441a6fc · 441a6fc
2 parents e63f26d + 657f0e4
commit 441a6fc
Show file tree

Hide file tree

Showing 17 changed files with 547 additions and 299 deletions.
diff --git a/bindings/.githead b/bindings/.githead
@@ -1 +1 @@
-75b2ef9f9ab9f9651a9d9d55e6bc0ad0fd8d4624
+7dfc2980e288534756bd12738e2137db7524dc88
diff --git a/bindings/gen_address_manager.go b/bindings/gen_address_manager.go
diff --git a/bindings/gen_assignment_hook.go b/bindings/gen_assignment_hook.go
diff --git a/bindings/gen_guardian_prover.go b/bindings/gen_guardian_prover.go
diff --git a/bindings/gen_taiko_l1.go b/bindings/gen_taiko_l1.go
diff --git a/bindings/gen_taiko_l2.go b/bindings/gen_taiko_l2.go