Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add the conflict message to display on the openQA page
This should happen whenever a conflict occurs
- Loading branch information