From 34d6cc9d5fbb7f217f642fb1680708593a4cb90a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20=C3=81ngel=20Garc=C3=ADa?= <mgarcia.inf@gmail.com>
Date: Tue, 4 Sep 2018 11:41:26 +0200
Subject: [PATCH] fix conflicts in main.go, vol: 2

---
 main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.go b/main.go
index 5ea387f..ae9f1f4 100644
--- a/main.go
+++ b/main.go
@@ -159,7 +159,7 @@ func run(c *cli.Context) error {
 		_ = godotenv.Load(c.String("env-file"))
 	}
 	p := plugin.Plugin{
-		Config: Config{
+		Config: plugin.Config{
 			APIServer:          c.String("api_server"),
 			Token:              c.String("token"),
 			Certificate:        c.String("certificate"),