merge conflict resolved

rowers/interactiveplots.py

@@ -1746,7 +1746,6 @@ def interactive_flex_chart2(id=0,promember=0,
 	    plot.line('x1','y2',color="red",y_range_name="yax2",
 		      legend=axlabels[yparam2],
 		      source=source2)
-<<<<<<< HEAD
 
 	elif plottype=='scatter':
 #	    plot.circle(x1,y2,color="red",y_range_name="yax2",legend=yparam2,
@@ -1778,39 +1777,6 @@ def interactive_flex_chart2(id=0,promember=0,
  
     hover.mode = 'mouse'
 
-=======
-
-	elif plottype=='scatter':
-#	    plot.circle(x1,y2,color="red",y_range_name="yax2",legend=yparam2,
-#			source=source,size=3)
-	    plot.scatter('x1','y2',source=source2,legend=axlabels[yparam2]
-			 ,fill_alpha=0.4,
-			 line_color=None,color="red",y_range_name="yax2")
-	
-	plot.add_layout(LinearAxis(y_range_name="yax2",
-				   axis_label=axlabels[yparam2]),'right')
-
-	y2means = Span(location=y2mean,dimension='width',line_color='red',
-		       line_dash=[6,6],line_width=2,y_range_name="yax2")
-
-
-	plot.add_layout(y2means)
-
-    hover = plot.select(dict(type=HoverTool))
-
-
-    hover.tooltips = OrderedDict([
-	('Time','@time'),
-	('Distance','@distance'),
-	('Pace','@pace'),
-	('HR','@hr'),
-	('SPM','@spmc{1.1}'),
-	('Power','@power{int}'),
-	])
- 
-    hover.mode = 'mouse'
-
->>>>>>> feature/sliders
     callback = CustomJS(args = dict(source=source,source2=source2,
 				    x1means=x1means,
 				    y1means=y1means,