fix merge conflict in package.json

jenny-s51 · Aug 15, 2024 · 298005f · 298005f
1 parent dd604c5
commit 298005f
Showing 1 changed file with 0 additions and 33 deletions.
diff --git a/frontend/package.json b/frontend/package.json
@@ -55,7 +55,6 @@
     "@monaco-editor/react": "^4.6.0",
     "@openshift/dynamic-plugin-sdk": "^4.0.0",
     "@openshift/dynamic-plugin-sdk-utils": "^4.0.1",
-<<<<<<< Updated upstream
     "@patternfly/patternfly": "5.4.0-prerelease.8",
     "@patternfly/quickstarts": "5.4.0-prerelease.4",
     "@patternfly/react-catalog-view-extension": "5.0.0",
@@ -71,22 +70,6 @@
     "@patternfly/react-topology": "5.4.0-prerelease.10",
     "@patternfly/react-virtualized-extension": "5.1.0",
     "@segment/analytics-next": "^1.72.0",
-=======
-    "@patternfly/patternfly": "^5.4.0-prerelease.8",
-    "@patternfly/quickstarts": "^5.4.0-prerelease.4",
-    "@patternfly/react-catalog-view-extension": "^5.0.0",
-    "@patternfly/react-charts": "^7.4.0-prerelease.17",
-    "@patternfly/react-code-editor": "^5.4.0-prerelease.33",
-    "@patternfly/react-core": "^5.4.0-prerelease.31",
-    "@patternfly/react-drag-drop": "^5.4.0-prerelease.32",
-    "@patternfly/react-icons": "^5.4.0-prerelease.10",
-    "@patternfly/react-log-viewer": "^5.2.0-prerelease.2",
-    "@patternfly/react-styles": "^5.4.0-prerelease.11",
-    "@patternfly/react-table": "^5.4.0-prerelease.34",
-    "@patternfly/react-tokens": "^5.4.0-prerelease.10",
-    "@patternfly/react-topology": "^5.4.0-prerelease.10",
-    "@patternfly/react-virtualized-extension": "^5.1.0",
->>>>>>> Stashed changes
     "@types/classnames": "^2.3.1",
     "axios": "^1.6.4",
     "classnames": "^2.2.6",
@@ -217,27 +200,11 @@
     "@patternfly/react-topology": {
       "react": "^18.2.0"
     },
-<<<<<<< Updated upstream
     "@patternfly/quickstarts": "5.4.0-prerelease.4",
     "@patternfly/react-core": "5.4.0-prerelease.33",
     "@patternfly/react-table": "5.4.0-prerelease.34",
     "@patternfly/react-icons": "5.4.0-prerelease.10",
     "@patternfly/react-styles": "5.4.0-prerelease.11",
     "ws": "^8.17.1"
-=======
-    "ws": "^8.17.1",
-    "@patternfly/patternfly": "^5.4.0-prerelease.8",
-    "@patternfly/quickstarts": "^5.4.0-prerelease.4",
-    "@patternfly/react-catalog-view-extension": "^5.0.0",
-    "@patternfly/react-charts": "^7.4.0-prerelease.17",
-    "@patternfly/react-code-editor": "^5.4.0-prerelease.33",
-    "@patternfly/react-core": "^5.4.0-prerelease.31",
-    "@patternfly/react-drag-drop": "^5.4.0-prerelease.32",
-    "@patternfly/react-icons": "^5.4.0-prerelease.10",
-    "@patternfly/react-log-viewer": "^5.2.0-prerelease.2",
-    "@patternfly/react-styles": "^5.4.0-prerelease.11",
-    "@patternfly/react-table": "^5.4.0-prerelease.34",
-    "@patternfly/react-tokens": "^5.4.0-prerelease.10"
->>>>>>> Stashed changes
   }
 }