Skip to content

Commit dd88df8

Browse files
committed
add missed merge conflict
1 parent 3ad9e07 commit dd88df8

File tree

1 file changed

+1
-8
lines changed
  • packages/react-charts/src/victory/components/ChartLegend/examples

1 file changed

+1
-8
lines changed

packages/react-charts/src/victory/components/ChartLegend/examples/ChartLegend.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -357,18 +357,11 @@ const InteractiveLegendChart = () => {
357357
// Checks if any data series is visible
358358
const isDataAvailable = () => hiddenSeries.size !== series.length;
359359

360-
<<<<<<< HEAD
361360
// Set chart width per current window size
362-
React.useEffect(() => {
361+
useEffect(() => {
363362
const observer = getResizeObserver(containerRef.current, () => {
364363
if (containerRef.current?.clientWidth) {
365364
setWidth(containerRef.current.clientWidth);
366-
=======
367-
const container = cloneElement(
368-
this.cursorVoronoiContainer,
369-
{
370-
disable: !this.isDataAvailable()
371-
>>>>>>> 19a2ed0a5 (charts changes)
372365
}
373366
});
374367
return () => observer();

0 commit comments

Comments
 (0)