Skip to content

Commit 08a0d0a

Browse files
committed
chore: fix yarn.lock
1 parent fa938f8 commit 08a0d0a

1 file changed

Lines changed: 1 addition & 6 deletions

File tree

yarn.lock

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5192,13 +5192,8 @@ __metadata:
51925192
resolution: "@patternfly/react-docs@workspace:packages/react-docs"
51935193
dependencies:
51945194
"@patternfly/documentation-framework": "npm:^6.36.8"
5195-
<<<<<<< HEAD
5196-
"@patternfly/patternfly": "npm:6.6.0-prerelease.18"
5197-
"@patternfly/patternfly-a11y": "npm:5.2.1"
5198-
=======
51995195
"@patternfly/patternfly": "npm:6.6.0-prerelease.20"
5200-
"@patternfly/patternfly-a11y": "npm:5.1.0"
5201-
>>>>>>> 00f3443eac (chore: bump to latest core)
5196+
"@patternfly/patternfly-a11y": "npm:5.2.1"
52025197
"@patternfly/react-charts": "workspace:^"
52035198
"@patternfly/react-code-editor": "workspace:^"
52045199
"@patternfly/react-core": "workspace:^"

0 commit comments

Comments
 (0)