fix: resolve conflict around kzg

Consensys · Jul 2, 2024 · 968b76f · 968b76f
1 parent 8716e79
commit 968b76f
Show file tree

Hide file tree

Showing 20 changed files with 281 additions and 215 deletions.
diff --git a/ecc/bls12-377/g1.go b/ecc/bls12-377/g1.go
diff --git a/ecc/bls12-377/g2.go b/ecc/bls12-377/g2.go
diff --git a/ecc/bls12-378/g1.go b/ecc/bls12-378/g1.go
diff --git a/ecc/bls12-378/g2.go b/ecc/bls12-378/g2.go
diff --git a/ecc/bls12-381/g1.go b/ecc/bls12-381/g1.go
diff --git a/ecc/bls12-381/g2.go b/ecc/bls12-381/g2.go
diff --git a/ecc/bls24-315/g1.go b/ecc/bls24-315/g1.go
diff --git a/ecc/bls24-315/g2.go b/ecc/bls24-315/g2.go