mirror of
https://github.com/k8snetworkplumbingwg/multus-cni.git
synced 2025-09-01 17:09:45 +00:00
hopefully resolved merge conflicts
This commit is contained in:
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"
|
"os"
|
||||||
|
|
||||||
"github.com/containernetworking/cni/pkg/types"
|
"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"
|
const ImplementedSpecVersion string = "0.4.0"
|
||||||
|
Reference in New Issue
Block a user