diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-01-08 15:18:15 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-01-08 20:48:31 +0000 |
| commit | da7556de4ad1d89bd97e1f6c5a146eee00e8c040 (patch) | |
| tree | ec384ffebaab42104b87fd7bffe12cb4104975bc /libpod | |
| parent | 21881679099491049db367504d09f9a48d3e5fa7 (diff) | |
| download | podman-da7556de4ad1d89bd97e1f6c5a146eee00e8c040.tar.gz podman-da7556de4ad1d89bd97e1f6c5a146eee00e8c040.tar.bz2 podman-da7556de4ad1d89bd97e1f6c5a146eee00e8c040.zip | |
Fix merge issues
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Closes: #189
Approved by: mheon
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/networking.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libpod/networking.go b/libpod/networking.go index 1d61fbc6c..456830708 100644 --- a/libpod/networking.go +++ b/libpod/networking.go @@ -1,6 +1,8 @@ package libpod import ( + "net" + "github.com/containernetworking/plugins/pkg/ns" "github.com/cri-o/ocicni/pkg/ocicni" "github.com/pkg/errors" |