From 5de1375c28790c24cfdaec55961a4da5800c6e09 Mon Sep 17 00:00:00 2001 From: Valery Piashchynski Date: Sun, 20 Dec 2020 19:26:20 +0300 Subject: Resolve merge conflict --- plugins/rpc/plugin.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/rpc/plugin.go') diff --git a/plugins/rpc/plugin.go b/plugins/rpc/plugin.go index 98242ade..d0dc0ff1 100755 --- a/plugins/rpc/plugin.go +++ b/plugins/rpc/plugin.go @@ -8,9 +8,9 @@ import ( "github.com/spiral/endure" "github.com/spiral/errors" goridgeRpc "github.com/spiral/goridge/v3/pkg/rpc" + "github.com/spiral/roadrunner/v2/interfaces/config" "github.com/spiral/roadrunner/v2/interfaces/log" rpc_ "github.com/spiral/roadrunner/v2/interfaces/rpc" - "github.com/spiral/roadrunner/v2/plugins/config" ) // PluginName contains default plugin name. -- cgit v1.2.3