[Integrated] RFR: 318: The "outdated" label should be renamed to "merge-conlict"

[Robin Westberg]

Changeset: 8cbce58d
Author:    Robin Westberg <rwestberg at openjdk.org>
Date:      2020-03-23 08:13:10 +0000
URL:       https://git.openjdk.java.net/skara/commit/8cbce58d

318: The "outdated" label should be renamed to "merge-conlict"

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
! cli/src/main/java/org/openjdk/skara/cli/pr/Utils.java