mirror of
https://github.com/k8snetworkplumbingwg/multus-cni.git
synced 2025-08-30 15:01:24 +00:00
hopefully resolved merge conflicts
This commit is contained in:
parent
aeb7870c3f
commit
a1b852b5bf
2
vendor/github.com/containernetworking/cni/pkg/types/current/types.go
generated
vendored
2
vendor/github.com/containernetworking/cni/pkg/types/current/types.go
generated
vendored
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user