fix(yarn.lock): resolve conflicts

patternfly · May 22, 2024 · 470505a · 470505a
1 parent c089767
commit 470505a
Show file tree

Hide file tree

Showing 3 changed files with 1,460 additions and 404 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
@@ -58,8 +58,8 @@
     "@patternfly/documentation-framework": "^5.2.15",
     "@patternfly/patternfly": "^5.1.0",
     "@patternfly/patternfly-a11y": "^4.3.1",
-    "@patternfly/react-code-editor": "^5.1.1",
-    "@patternfly/react-table": "^5.1.1",
+    "@patternfly/react-code-editor": "^6.0.0-alpha.26",
+    "@patternfly/react-table": "^6.0.0-alpha.26",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
     "camel-case": "^3.0.0",