.
Version: unspecified
Severity: major
.
Version: unspecified
Severity: major
Change 156491 had a related patch set uploaded by Jforrester:
Make the Resolve conflict button actually appear
Change 156491 merged by jenkins-bot:
Make the Resolve conflict button actually appear
Change 156493 had a related patch set uploaded by Catrope:
Make the Resolve conflict button actually appear
Change 156494 had a related patch set uploaded by Catrope:
Make the Resolve conflict button actually appear
Change 156493 merged by jenkins-bot:
Make the Resolve conflict button actually appear