mirror of
https://github.com/wneessen/go-mail.git
synced 2024-11-08 23:12:54 +01:00
Resolve merge conflict
This commit is contained in:
parent
4ec95adb30
commit
ee3283b00b
1 changed files with 2 additions and 2 deletions
|
@ -89,11 +89,11 @@ func (mw *msgWriter) writeMsg(m *Msg) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if m.hasMixed() {
|
if m.hasMixed() {
|
||||||
mw.startMP(MIMEMixed, m.boundary)
|
mw.startMP("mixed", m.boundary)
|
||||||
mw.writeString(DoubleNewLine)
|
mw.writeString(DoubleNewLine)
|
||||||
}
|
}
|
||||||
if m.hasRelated() {
|
if m.hasRelated() {
|
||||||
mw.startMP(MIMERelated, m.boundary)
|
mw.startMP("related", m.boundary)
|
||||||
mw.writeString(DoubleNewLine)
|
mw.writeString(DoubleNewLine)
|
||||||
}
|
}
|
||||||
if m.hasAlt() {
|
if m.hasAlt() {
|
||||||
|
|
Loading…
Reference in a new issue