From 3d4dde6fd0c252cfb68059027ae4fb7ffdbe4077 Mon Sep 17 00:00:00 2001
From: Hans Moog <hm@mkjc.net>
Date: Wed, 4 Mar 2020 11:52:43 +0100
Subject: [PATCH] Fix: fixed merge bug
---
main.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/main.go b/main.go
index 7876622f..d7917c30 100644
--- a/main.go
+++ b/main.go
@@ -4,12 +4,12 @@ import (
"net/http"
_ "net/http/pprof"
+ "github.com/iotaledger/hive.go/node"
+
"github.com/iotaledger/goshimmer/pluginmgr/core"
"github.com/iotaledger/goshimmer/pluginmgr/research"
"github.com/iotaledger/goshimmer/pluginmgr/ui"
"github.com/iotaledger/goshimmer/pluginmgr/webapi"
- "github.com/iotaledger/goshimmer/plugins/config"
- "github.com/iotaledger/hive.go/node"
)
func main() {
--
GitLab