Three conflict marker lines (ours, divider, theirs) were committed in an earlier merge. Both sides are separate items (BL-069 and BL-062 to BL-068), so only the marker lines are removed. No item text changed.
Three conflict marker lines (ours, divider, theirs) were committed in an earlier merge. Both sides are separate items (BL-069 and BL-062 to BL-068), so only the marker lines are removed. No item text changed.