diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-27 16:01:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-27 16:01:45 +0200 |
| commit | 0906b32087c3d7db6844873a7d46241430a1b065 (patch) | |
| tree | 3c68a0c2d6e2e5742b4cc314136ddb8e9877ec75 /cmd/podman/main.go | |
| parent | 5e3d63a53c0762c99c5eb7863ef7fc8d0b2e8eec (diff) | |
| parent | 8561b996447793999a6465f9b9e3f0f7bbea2c6a (diff) | |
| download | podman-0906b32087c3d7db6844873a7d46241430a1b065.tar.gz podman-0906b32087c3d7db6844873a7d46241430a1b065.tar.bz2 podman-0906b32087c3d7db6844873a7d46241430a1b065.zip | |
Merge pull request #3442 from baude/removelibpodfrommainphase2
libpod removal from main (phase 2)
Diffstat (limited to 'cmd/podman/main.go')
| -rw-r--r-- | cmd/podman/main.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/main.go b/cmd/podman/main.go index 847cc0731..04b1e80cf 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -2,11 +2,11 @@ package main import ( "context" + "github.com/containers/libpod/libpod" "io" "os" "github.com/containers/libpod/cmd/podman/cliconfig" - "github.com/containers/libpod/libpod" _ "github.com/containers/libpod/pkg/hooks/0.1.0" "github.com/containers/libpod/pkg/rootless" "github.com/containers/libpod/version" |