fix merge issue

This commit is contained in:
Wenkai Yin 2017-03-21 16:29:51 +08:00
parent 383997f785
commit 753a544294

View File

@ -9,7 +9,7 @@ import (
"github.com/astaxie/beego"
"github.com/beego/i18n"
"github.com/vmware/harbor/src/common/config"
"github.com/vmware/harbor/src/common"
"github.com/vmware/harbor/src/common/dao"
"github.com/vmware/harbor/src/common/models"
"github.com/vmware/harbor/src/common/utils"
@ -113,7 +113,7 @@ func (cc *CommonController) SendEmail() {
message := new(bytes.Buffer)
harborURL := config.ExtEndpoint
harborURL := common.ExtEndpoint
if harborURL == "" {
harborURL = "localhost"
}