summaryrefslogtreecommitdiff
path: root/cmd/podman/diff.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-03-11 17:56:58 -0700
committerGitHub <noreply@github.com>2019-03-11 17:56:58 -0700
commitdcd253f2e4da25e7e5af33bef4de5529162a7c1b (patch)
tree93d6028a81bf6a3979134ac66384e615ddf0cc4d /cmd/podman/diff.go
parentdec36f2d0b940f7c144dd5617b3cb5bd31fd2bc5 (diff)
parente3d8e79d9569f3e328facac7978ed3c2ad786eb7 (diff)
downloadpodman-dcd253f2e4da25e7e5af33bef4de5529162a7c1b.tar.gz
podman-dcd253f2e4da25e7e5af33bef4de5529162a7c1b.tar.bz2
podman-dcd253f2e4da25e7e5af33bef4de5529162a7c1b.zip
Merge pull request #2609 from QiWang19/moveformats
move formats pkg to and vendor from buildah
Diffstat (limited to 'cmd/podman/diff.go')
-rw-r--r--cmd/podman/diff.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/diff.go b/cmd/podman/diff.go
index bd3a985b7..e77e562d4 100644
--- a/cmd/podman/diff.go
+++ b/cmd/podman/diff.go
@@ -2,8 +2,8 @@ package main
import (
"fmt"
+ "github.com/containers/buildah/pkg/formats"
"github.com/containers/libpod/cmd/podman/cliconfig"
- "github.com/containers/libpod/cmd/podman/formats"
"github.com/containers/libpod/cmd/podman/libpodruntime"
"github.com/containers/storage/pkg/archive"
"github.com/pkg/errors"