rm merge conflict resolve

Author: 6543

models/issue_comment.go

@@ -858,17 +858,8 @@ func updateCommentInfos(ctx context.Context, opts *CreateCommentOptions, comment
 				if _, err = e.ID(attachments[i].ID).Update(attachments[i]); err != nil {
 					return fmt.Errorf("update attachment [%d]: %v", attachments[i].ID, err)
 				}
-
-				for i := range attachments {
-					attachments[i].IssueID = opts.Issue.ID
-					attachments[i].CommentID = comment.ID
-					// No assign value could be 0, so ignore AllCols().
-					if _, err = e.ID(attachments[i].ID).Update(attachments[i]); err != nil {
-						return fmt.Errorf("update attachment [%d]: %v", attachments[i].ID, err)
-					}
-				}
-				comment.Attachments = attachments
 			}
+			comment.Attachments = attachments
 		}
 	case CommentTypeReopen, CommentTypeClose:
 		if err = updateIssueClosedNum(ctx, opts.Issue); err != nil {