From da7556de4ad1d89bd97e1f6c5a146eee00e8c040 Mon Sep 17 00:00:00 2001
From: Matthew Heon <matthew.heon@gmail.com>
Date: Mon, 8 Jan 2018 15:18:15 -0500
Subject: Fix merge issues

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #189
Approved by: mheon
---
 libpod/networking.go | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'libpod')

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"
-- 
cgit v1.2.3-54-g00ecf