Update keys.go

Author: sparx7783

keys.go

@@ -72,11 +72,8 @@ func ValidatePrivateKey(b []byte) (bool, error) {
 	if len(b) != voied25519.PrivateKeySize {
 		return false, fmt.Errorf("invalid private key size, expected %v, got %d", voied25519.PrivateKeySize, len(b))
 	}
-<<<<<<< HEAD
+
 	// check if the public key is on the ed25519 curve
-=======
-	// check if the public key is on the voied25519 curve
->>>>>>> f4f19e0 (rename)
 	pub := voied25519.PrivateKey(b).Public().(voied25519.PublicKey)
 	if !IsOnCurve(pub) {
 		return false, errors.New("the corresponding public key is NOT on the voied25519 curve")
@@ -156,11 +153,7 @@ func (k PrivateKey) PublicKey() PublicKey {
 // PK is a convenience alias for PublicKey
 type PK = PublicKey
 
-<<<<<<< HEAD
-// done to keep verify the same as stdlib crypto/ed25519
-=======
 // done to keep verify the same as stdlib crypto/voied25519
->>>>>>> f4f19e0 (rename)
 var verifyOptsStdLib = &voied25519.Options{
 	Verify: voied25519.VerifyOptionsStdLib,
 }