resolve merge error and fmt

mercata · mercata · commit 601dcda53b75 · 2025-06-11T22:07:06.000+02:00
diff --git a/imapserver/imapmemserver/mailbox.go b/imapserver/imapmemserver/mailbox.go
@@ -97,14 +97,11 @@ func (mbox *Mailbox) statusDataLocked(options *imap.StatusOptions) *imap.StatusD
 	}
 	if options.HighestModSeq {
 		data.HighestModSeq = mbox.highestModSeq
-  }
+	}
 	if options.NumRecent {
 		num := uint32(0)
 		data.NumRecent = &num
 	}
-	if options.HighestModSeq {
-		data.HighestModSeq = mbox.highestModSeq
-	}
 	return &data
 }
 

Original file line number	Diff line number	Diff line change
`@@ -97,14 +97,11 @@ func (mbox Mailbox) statusDataLocked(options imap.StatusOptions) *imap.StatusD`
`97`	`97`	`}`
`98`	`98`	`if options.HighestModSeq {`
`99`	`99`	`data.HighestModSeq = mbox.highestModSeq`
`100`		`- }`
	`100`	`+ }`
`101`	`101`	`if options.NumRecent {`
`102`	`102`	`num := uint32(0)`
`103`	`103`	`data.NumRecent = &num`
`104`	`104`	`}`
`105`		`- if options.HighestModSeq {`
`106`		`- data.HighestModSeq = mbox.highestModSeq`
`107`		`- }`
`108`	`105`	`return &data`
`109`	`106`	`}`
`110`	`107`