In file DefaultCodeManager.php was is found trash consequences after not clean merge.

CommentFileSizeAuthor
#2 fix_merge.patch668 bytesr.nabiullin
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

nabiyllin created an issue. See original summary.

r.nabiullin’s picture

r.nabiullin CreditAttribution: r.nabiullin at Skilld commented
Status: Needs work » Needs review
FileSize
fix_merge.patch668 bytes
andypost’s picture

andypost
he/him
Primary language Russian
CreditAttribution: andypost as a volunteer and at Skilld commented
Status: Needs review » Reviewed & tested by the community

Thanx a lot!

Sam152’s picture

Sam152 CreditAttribution: Sam152 as a volunteer and at PreviousNext commented

Another good catch. Thanks. Fixed.

Sam152’s picture

Sam152 CreditAttribution: Sam152 as a volunteer and at PreviousNext commented
Sam152’s picture

Sam152 CreditAttribution: Sam152 as a volunteer and at PreviousNext commented
Status: Reviewed & tested by the community » Fixed

  • Sam152 committed 2062446 on 8.x-1.x authored by nabiyllin 
    Issue #2682823 by nabiyllin, andypost: Fix broken merge results

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.