Fixed merge issue in testwidgets
Fixed merge issue in testwidgets

vascotenner/holoviews,basnijholt/holoviews,basnijholt/holoviews,ioam/holoviews,vascotenner/holoviews,ioam/holoviews,basnijholt/holoviews,ioam/holoviews,vascotenner/holoviews