Resolve conflict

This commit is contained in:
Khanh Ngo 2023-12-29 10:13:30 +01:00
commit 8cfe9a3d5b
No known key found for this signature in database
GPG key ID: 29077342AA5648F6
25 changed files with 1550 additions and 405 deletions

View file

@ -13,7 +13,7 @@ type SmtpMail struct {
port int
username string
password string
SmtpHelo string
smtpHelo string
authType mail.AuthType
encryption mail.Encryption
noTLSCheck bool
@ -48,7 +48,7 @@ func encryptionType(encryptionType string) mail.Encryption {
}
func NewSmtpMail(hostname string, port int, username string, password string, SmtpHelo string, noTLSCheck bool, auth string, fromName, from string, encryption string) *SmtpMail {
ans := SmtpMail{hostname: hostname, port: port, username: username, password: password, SmtpHelo: SmtpHelo, noTLSCheck: noTLSCheck, fromName: fromName, from: from, authType: authType(auth), encryption: encryptionType(encryption)}
ans := SmtpMail{hostname: hostname, port: port, username: username, password: password, smtpHelo: SmtpHelo, noTLSCheck: noTLSCheck, fromName: fromName, from: from, authType: authType(auth), encryption: encryptionType(encryption)}
return &ans
}