[Integrated] RFR: 374: Do not show integration message when PR has merge conflict

[Robin Westberg]

Changeset: 7b79f857
Author:    Robin Westberg <rwestberg at openjdk.org>
Date:      2020-04-20 11:44:48 +0000
URL:       https://git.openjdk.java.net/skara/commit/7b79f857

374: Do not show integration message when PR has merge conflict

Reviewed-by: ehelin

! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
! bots/pr/src/test/java/org/openjdk/skara/bots/pr/CheckTests.java