docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix rebase 

Signed-off-by: Victor Vieux <vieux@docker.com>
This commit is contained in:
Victor Vieux 2016-04-21 16:45:57 -07:00
parent 622b509274
commit a03b709728
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Godeps/Godeps.json generated
View File

@ -130,8 +130,8 @@
}, },
{ {
"ImportPath": "github.com/docker/engine-api/types/events", "ImportPath": "github.com/docker/engine-api/types/events",
"Comment": "v0.3.1-16-g6ca9064", "Comment": "v0.3.1-34-g5b9e86c",
"Rev": "6ca9064650fd3d66ea1722c24e475ec0138feb11" "Rev": "5b9e86c11862e755be8871b64aada2a65ded4b8b"
}, },
{ {
"ImportPath": "github.com/docker/engine-api/types/filters", "ImportPath": "github.com/docker/engine-api/types/filters",

2
Godeps/_workspace/.gitignore generated vendored
View File

@ -1,2 +0,0 @@
/pkg
/bin