From a03b7097280ba32c1865a59c445d377ed51b2c0b Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Thu, 21 Apr 2016 16:45:57 -0700 Subject: [PATCH] fix rebase Signed-off-by: Victor Vieux --- Godeps/Godeps.json | 4 ++-- Godeps/_workspace/.gitignore | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 Godeps/_workspace/.gitignore diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index c71b2383ae..6c1b674105 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -130,8 +130,8 @@ }, { "ImportPath": "github.com/docker/engine-api/types/events", - "Comment": "v0.3.1-16-g6ca9064", - "Rev": "6ca9064650fd3d66ea1722c24e475ec0138feb11" + "Comment": "v0.3.1-34-g5b9e86c", + "Rev": "5b9e86c11862e755be8871b64aada2a65ded4b8b" }, { "ImportPath": "github.com/docker/engine-api/types/filters", diff --git a/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore deleted file mode 100644 index f037d684ef..0000000000 --- a/Godeps/_workspace/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/pkg -/bin