From de75cadd98db4ccc256d8664d849149a363d81be Mon Sep 17 00:00:00 2001
From: alvaro-alonso <alfmail@pm.me>
Date: Tue, 2 Jan 2024 23:04:39 +0100
Subject: [PATCH] remove merge conflicts

---
 zokrates_stdlib/stdlib/ecc/proofOfOwnership.zok | 4 ----
 zokrates_stdlib/stdlib/ecc/verifyEddsa.zok      | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/zokrates_stdlib/stdlib/ecc/proofOfOwnership.zok b/zokrates_stdlib/stdlib/ecc/proofOfOwnership.zok
index 5d01ef14c..eb5844fa3 100644
--- 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
index bee1ef926..29c8cecde 100644
--- 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.