fix merge conflect in vendor.conf
@@ -21,8 +21,4 @@ github.com/gorilla/websocket v1.2.0
golang.org/x/sync fd80eb99c8f653c847d294a001bdf2a3a6f768f5
github.com/rancher/norman 8c0d4bfe2e63a801e4e21906d6b37a5173dadcbb
-<<<<<<< HEAD
github.com/rancher/types a2625e8dc81780f5e4cfc05f771fe4bb1516fd44
-=======
-github.com/rancher/types a673adfbf6b691bfbb3fa79dccdd59f64bdf6e3f
->>>>>>> vendor bump
