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 #39706
fast-build

00:22:39

passed #39707
legal-check

00:03:21

 
  Prepare
passed #39709
centos-xdk-prepare

00:01:58

passed #39710
macos
macos-xdk-prepare

00:00:34

passed #39708
ubuntu-xdk-prepare

00:00:37

passed #39711
windows10
windows-10-prepare

00:01:24

passed #39712
windows8
windows-8-prepare

00:01:23

 
  Build
passed #39715
centos-xdk-build

00:35:57

passed #39713
debian-build

00:43:11

passed #39716
macos
macos-xdk-build

00:13:27

passed #39714
ubuntu-xdk-build-doc

00:32:08

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

01:02:10

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

00:57:07

passed #39717
windows10
windows-10-build

01:07:55

passed #39718
windows8
windows-8-build

00:39:21

 
  Report
passed #39721
ubuntu-xdk-report

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