rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-02 07:24:20 +00:00
Code Issues Releases Wiki Activity

fix merge conflect in vendor.conf

Browse Source
This commit is contained in:
moelsayed
2017-12-18 01:53:28 +02:00
parent f5de7ff42e
commit 7d53fcaf6c
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vendor.conf
View File

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