From 9835e63e7508cd2a9a336ecb55423178cf3f31fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= <quxuan@yunionyun.com>
Date: Thu, 13 Sep 2018 16:27:06 +0800
Subject: [PATCH] resolve conflict

---
 pkg/compute/models/wires.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg/compute/models/wires.go b/pkg/compute/models/wires.go
index 4bd483bdb8..7dea974aed 100644
--- a/pkg/compute/models/wires.go
+++ b/pkg/compute/models/wires.go
@@ -512,7 +512,6 @@ func (self *SWire) GetIWire() (cloudprovider.ICloudWire, error) {
 	}
 	ivpc, err := vpc.GetIVpc()
 	if err != nil {
-		log.Errorf("can not find ivpc")
 		return nil, err
 	}
 	return ivpc.GetIWireById(self.GetExternalId())