Skip to content
Snippets Groups Projects
Commit 3d4dde6f authored by Hans Moog's avatar Hans Moog
Browse files

Fix: fixed merge bug

parent 506d69fe
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
main.go
+ 2
− 2
View file @ 3d4dde6f
...@@ -4,12 +4,12 @@ import ( ...@@ -4,12 +4,12 @@ import (
"net/http" "net/http"
_ "net/http/pprof" _ "net/http/pprof"
"github.com/iotaledger/hive.go/node"
"github.com/iotaledger/goshimmer/pluginmgr/core" "github.com/iotaledger/goshimmer/pluginmgr/core"
"github.com/iotaledger/goshimmer/pluginmgr/research" "github.com/iotaledger/goshimmer/pluginmgr/research"
"github.com/iotaledger/goshimmer/pluginmgr/ui" "github.com/iotaledger/goshimmer/pluginmgr/ui"
"github.com/iotaledger/goshimmer/pluginmgr/webapi" "github.com/iotaledger/goshimmer/pluginmgr/webapi"
"github.com/iotaledger/goshimmer/plugins/config"
"github.com/iotaledger/hive.go/node"
) )
func main() { func main() {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment