COMP: fix conflicts

24 jobs for !795 with improve-opticalibration-pleiades in 141 minutes and 28 seconds (queued for 2 seconds)
latest detached
Status Job ID Name Coverage
  Precheck
passed fast-build #39706

00:22:39

passed legal-check #39707

00:03:21

 
  Prepare
passed centos-xdk-prepare #39709

00:01:58

passed macos-xdk-prepare #39710
macos

00:00:34

passed ubuntu-xdk-prepare #39708

00:00:37

passed windows-10-prepare #39711
windows10

00:01:24

passed windows-8-prepare #39712
windows8

00:01:23

 
  Build
passed centos-xdk-build #39715

00:35:57

passed debian-build #39713

00:43:11

passed macos-xdk-build #39716
macos

00:13:27

passed ubuntu-xdk-build-doc #39714

00:32:08

passed ubuntu-xdk-qa-code-coverage #39719

01:02:10

passed ubuntu-xdk-qa-static-analysis #39720

00:57:07

passed windows-10-build #39717
windows10

01:07:55

passed windows-8-build #39718
windows8

00:39:21

 
  Report
passed ubuntu-xdk-report #39721

00:02:12

 
  External
passed cdash:centos-6.6-gcc

passed cdash:debian-testing-gcc

passed cdash:macos-10.11.6-clang

passed cdash:ubuntu-18.04-fast

passed cdash:ubuntu-18.04-llvm-qa

passed cdash:ubuntu-18.04-llvm-xdk

passed cdash:windows-10-x64-vc14.0

passed cdash:windows-8.1-x86-vc14.0