resolve conflict

This commit is contained in:
屈轩
2018-09-13 16:27:06 +08:00
parent 730d83b733
commit 9835e63e75
-1
View File
@@ -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())