remove merge conflicts

Zokrates · Jan 2, 2024 · de75cad · de75cad
1 parent 1831b18
commit de75cad
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/zokrates_stdlib/stdlib/ecc/proofOfOwnership.zok b/zokrates_stdlib/stdlib/ecc/proofOfOwnership.zok
@@ -14,10 +14,6 @@ from "ecc/edwards" import scalarMul;
 /// G: Generator point
 /// EDWARDS_A: Coefficient `a` of the twisted Edwards curve
 /// EDWARDS_D: Coefficient `d` of the twisted Edwards curve
-<<<<<<< HEAD
-=======
-/// bit_size: Bit size of the twisted Edwards curve
->>>>>>> upstream/jubjub
 ///
 /// Returns true for pk/sk being a valid keypair, false otherwise.
 def main(field[2] pk, field sk, field[2] G, field EDWARDS_A, field EDWARDS_D) -> bool {

diff --git a/zokrates_stdlib/stdlib/ecc/verifyEddsa.zok b/zokrates_stdlib/stdlib/ecc/verifyEddsa.zok
@@ -24,10 +24,6 @@ from "ecc/edwards" import add, scalarMul, onCurve, orderCheck;
 /// M1: 256bit array. Trailing 256bits of the message used to create S.
 /// EDWARDS_A: Coefficient `a` of the twisted Edwards curve
 /// EDWARDS_D: Coefficient `d` of the twisted Edwards curve
-<<<<<<< HEAD
-=======
-/// bit_size: Bit size of the twisted Edwards curve
->>>>>>> upstream/jubjub
 ///
 /// Returns:
 /// Return true for S being a valid EdDSA Signature, false otherwise.