Fixed merge conflicts

9 jobs for 1.1.0 in 26 minutes and 26 seconds (queued for 2 seconds)
latest
Status Name Job ID Coverage
  Docker Login
passed docker_login #12664
docker sci ubuntu

00:00:48

 
  Ci
passed ci:osx #12668
sci osx-10.13

00:11:47

passed ci:ubuntu_bionic #12667
docker sci ubuntu

00:05:37

passed ci:ubuntu_trusty #12665
docker sci ubuntu

00:05:36

passed ci:ubuntu_xenial #12666
docker sci ubuntu

00:05:20

passed ci:windows #12669
sci windows-10

00:06:57

 
  Clean
passed clean:docker #12670
docker sci ubuntu

00:00:21

passed clean:osx #12671
sci osx-10.13

00:00:19

passed clean:windows #12672
sci windows-10

00:01:14