Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix conflicts

pull/10616/head
Andrew Watkins 2018-04-09 20:07:32 -07:00
parent 790834fe01
commit 2d0342d62d
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/src/shared/components/RefreshingGraph.js
View File

@ -101,9 +101,6 @@ const RefreshingGraph = ({
cellHeight={cellHeight} cellHeight={cellHeight}
resizeCoords={resizeCoords} resizeCoords={resizeCoords}
tableOptions={tableOptions} tableOptions={tableOptions}
hoverTime={hoverTime}
inView={inView}
setDataLabels={setDataLabels}
resizerTopHeight={resizerTopHeight} resizerTopHeight={resizerTopHeight}
handleSetHoverTime={handleSetHoverTime} handleSetHoverTime={handleSetHoverTime}
/> />
@ -162,12 +159,8 @@ RefreshingGraph.propTypes = {
cellID: string, cellID: string,
inView: bool, inView: bool,
tableOptions: shape({}), tableOptions: shape({}),
<<<<<<< HEAD
=======
setDataLabels: func,
hoverTime: string.isRequired, hoverTime: string.isRequired,
handleSetHoverTime: func.isRequired, handleSetHoverTime: func.isRequired,
>>>>>>> Fix crosshair hovering performance issue
} }
RefreshingGraph.defaultProps = { RefreshingGraph.defaultProps = {