From a1b852b5bfa04fe8ecfc23f230d550a10dbf86e0 Mon Sep 17 00:00:00 2001 From: Nikhil Date: Thu, 11 Jul 2019 15:03:53 -0400 Subject: [PATCH] hopefully resolved merge conflicts --- .../containernetworking/cni/pkg/types/current/types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/github.com/containernetworking/cni/pkg/types/current/types.go b/vendor/github.com/containernetworking/cni/pkg/types/current/types.go index 7267a2e6d..dc3e145e1 100644 --- a/vendor/github.com/containernetworking/cni/pkg/types/current/types.go +++ b/vendor/github.com/containernetworking/cni/pkg/types/current/types.go @@ -22,7 +22,7 @@ import ( "os" "github.com/containernetworking/cni/pkg/types" - "github.com/containernetworking/cni/pkg/types/020" + types020 "github.com/containernetworking/cni/pkg/types/020" ) const ImplementedSpecVersion string = "0.4.0"