hopefully resolved merge conflicts

This commit is contained in:
Nikhil 2019-07-11 15:03:53 -04:00 committed by Tomofumi Hayashi
parent aeb7870c3f
commit a1b852b5bf

View File

@ -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"