remove merge conflict markers

patternfly · May 16, 2024 · 862b8f7 · 862b8f7
1 parent 0b4e175
commit 862b8f7
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/packages/module/package.json b/packages/module/package.json
@@ -33,15 +33,9 @@
     "tag": "alpha"
   },
   "dependencies": {
-<<<<<<< HEAD
     "@patternfly/react-core": "^6.0.0-alpha.26",
     "@patternfly/react-icons": "^6.0.0-alpha.11",
     "@patternfly/react-styles": "^6.0.0-alpha.11",
-=======
-    "@patternfly/react-core": "^6.0.0-alpha.2",
-    "@patternfly/react-icons": "^6.0.0-alpha.2",
-    "@patternfly/react-styles": "^6.0.0-alpha.2",
->>>>>>> b564d2c (add v6 configs)
     "@types/d3": "^7.4.0",
     "@types/d3-force": "^1.2.1",
     "@types/dagre": "0.7.42",

diff --git a/packages/module/src/components/edges/terminals/DefaultConnectorTerminal.tsx b/packages/module/src/components/edges/terminals/DefaultConnectorTerminal.tsx
@@ -59,15 +59,10 @@ const DefaultConnectorTerminal: React.FunctionComponent<EdgeConnectorArrowProps>
     return null;
   }
   const bendPoints = edge.getBendpoints();
-<<<<<<< HEAD
   const defaultStartPoint = isTarget
     ? bendPoints[bendPoints.length - 1] || edge.getStartPoint()
     : bendPoints[0] || edge.getEndPoint();
   const defaultEndPoint = isTarget ? edge.getEndPoint() : edge.getStartPoint();
-=======
-  const startPoint = isTarget ? bendPoints[bendPoints.length - 1] || edge.getStartPoint() : bendPoints[0] || edge.getEndPoint();
-  const endPoint = isTarget ? edge.getEndPoint() : edge.getStartPoint();
->>>>>>> 2d74dec (fix(lodash): Remove dependency on lodash)
   const classes = css(styles.topologyEdge, className, StatusModifier[status]);
 
   return (