From 57fb0e530c99cc167012e3b2263802ccfa079fd9 Mon Sep 17 00:00:00 2001
From: Luke <rohenaz@gmail.com>
Date: Sun, 1 Nov 2020 02:19:25 -0500
Subject: [PATCH] fix merge

---
 sign.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sign.go b/sign.go
index 91c3005..438cd39 100644
--- a/sign.go
+++ b/sign.go
@@ -29,11 +29,7 @@ func SignMessage(privateKey string, message string) (string, error) {
 
 	// Create the hash
 	messageHash := chainhash.DoubleHashB(buf.Bytes())
-<<<<<<< HEAD
-	// fmt.Printf("%x", messageHash)
-=======
 
->>>>>>> 8d7d6e33b2784fbeaf5bd30a409422d3bd573994
 	// Get the private key
 	var ecdsaPrivateKey *bsvec.PrivateKey
 	if ecdsaPrivateKey, err = PrivateKeyFromString(privateKey); err != nil {