Merge pull request #199 from jeff-phillips-18/v6-fix

chore(package.json) Fix V6 package.json file
patternfly · May 22, 2024 · 62590e1 · 62590e1
2 parents da69462 + 06767f5
commit 62590e1
Show file tree

Hide file tree

Showing 3 changed files with 1,285 additions and 296 deletions.
diff --git a/.github/workflows/pr-preview.yml b/.github/workflows/pr-preview.yml
@@ -15,10 +15,10 @@ jobs:
           git fetch origin pull/$GH_PR_NUM/head:tmp
           git checkout tmp
       - run: |
-          git rev-parse origin/main
+          git rev-parse origin/v6
           git rev-parse HEAD
-          git rev-parse origin/main..HEAD
-          git log origin/main..HEAD --format="%b"
+          git rev-parse origin/v6..HEAD
+          git log origin/v6..HEAD --format="%b"
       # Yes, we really want to checkout the PR
       # Injected by generate-workflows.js
       - uses: actions/setup-node@v1

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",