fixed merge conflicts

8 jobs for imp_scrollbar in 0 seconds (queued for 730 minutes and 55 seconds)
latest
Status Name Job ID Coverage
  Test
failed debian_stretch_x86_64_deb #27615
debian stretch x86_64

failed osx_10.11_x86_64_dmg #27619
osx v10.11 dmg

failed osx_10.8_x86_64_dmg #27620
osx v10.8 dmg

failed raspbian_stretch_armv7l_deb #27622
raspbian arm stretch

failed ubuntu_14.04_i386_deb #27616
v14.04 i386 ubuntu

failed ubuntu_14.04_x86_64_deb #27617
ubuntu v14.04 x86_64

failed ubuntu_16.04_x86_64_deb #27618
ubuntu v16.04 x86_64

failed windows_i386_innosetup #27621
windows i386

 
Name Stage Failure
failed
ubuntu_14.04_i386_deb Test There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log
failed
ubuntu_16.04_x86_64_deb Test There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log
failed
raspbian_stretch_armv7l_deb Test There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log
failed
osx_10.11_x86_64_dmg Test There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log
failed
osx_10.8_x86_64_dmg Test There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log
failed
windows_i386_innosetup Test There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log
failed
ubuntu_14.04_x86_64_deb Test There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log
failed
debian_stretch_x86_64_deb Test There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log