diff options
| author | Valery Piashchynski <[email protected]> | 2020-12-20 19:26:20 +0300 |
|---|---|---|
| committer | Valery Piashchynski <[email protected]> | 2020-12-20 19:26:20 +0300 |
| commit | 5de1375c28790c24cfdaec55961a4da5800c6e09 (patch) | |
| tree | bc53724c7514dcb5c901958097a6f2e7c4531ba9 /plugins | |
| parent | f4a36c7f684216fb408693a6c494486144df57cf (diff) | |
Resolve merge conflict
Diffstat (limited to 'plugins')
| -rwxr-xr-x | plugins/rpc/plugin.go | 2 |
1 files changed, 1 insertions, 1 deletions
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. |