fix merge conflict

patternfly · Oct 31, 2023 · 21b7941 · 21b7941
1 parent 27ea3c9
commit 21b7941
Showing 1 changed file with 1 addition and 13 deletions.
diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
@@ -22,27 +22,15 @@
     "test:a11y": "patternfly-a11y --config patternfly-a11y.config"
   },
   "dependencies": {
-<<<<<<< HEAD
     "@patternfly/patternfly": "5.2.0-prerelease.2",
     "@patternfly/react-charts": "^7.2.0-prerelease.4",
     "@patternfly/react-code-editor": "^5.2.0-prerelease.14",
     "@patternfly/react-core": "^5.2.0-prerelease.14",
-    "@patternfly/react-drag-drop": "^5.0.0-alpha.0",
+    "@patternfly/react-drag-drop": "^5.2.0-prelease.0",
     "@patternfly/react-icons": "^5.2.0-prerelease.3",
     "@patternfly/react-styles": "^5.2.0-prerelease.2",
     "@patternfly/react-table": "^5.2.0-prerelease.14",
     "@patternfly/react-tokens": "^5.2.0-prerelease.3"
-=======
-    "@patternfly/patternfly": "5.2.0-prerelease.1",
-    "@patternfly/react-charts": "^7.2.0-prerelease.2",
-    "@patternfly/react-code-editor": "^5.2.0-prerelease.2",
-    "@patternfly/react-core": "^5.2.0-prerelease.2",
-    "@patternfly/react-drag-drop": "^5.2.0-prelease.0",
-    "@patternfly/react-icons": "^5.2.0-prerelease.1",
-    "@patternfly/react-styles": "^5.2.0-prerelease.1",
-    "@patternfly/react-table": "^5.2.0-prerelease.2",
-    "@patternfly/react-tokens": "^5.2.0-prerelease.1"
->>>>>>> 4380b50910 (refactor a bunch)
   },
   "devDependencies": {
     "@patternfly/documentation-framework": "^5.0.15",