From 5390b8863ba56770a86af66a2187d019b83286f5 Mon Sep 17 00:00:00 2001
From: Benjamin Bollen <ben@erisindustries.com>
Date: Wed, 11 May 2016 00:43:03 +0200
Subject: [PATCH] correct minor merge errors
---
erisdb/restServer.go | 2 +-
erisdb/serve.go | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/erisdb/restServer.go b/erisdb/restServer.go
index e8e91a82..e6a7ca16 100644
--- a/erisdb/restServer.go
+++ b/erisdb/restServer.go
@@ -379,7 +379,7 @@ func (this *RestServer) handleBroadcastTx(c *gin.Context) {
if errD != nil {
c.AbortWithError(500, errD)
}
- receipt, err := this.pipe.Transactor().BroadcastTx(*param)
+ receipt, err := this.pipe.Transactor().BroadcastTx(param)
if err != nil {
c.AbortWithError(500, err)
}
diff --git a/erisdb/serve.go b/erisdb/serve.go
index 859ed16f..254f2515 100644
--- a/erisdb/serve.go
+++ b/erisdb/serve.go
@@ -3,7 +3,6 @@
package erisdb
import (
- "encoding/hex"
"bytes"
"fmt"
"io/ioutil"
--
GitLab