Skip to content

Commit

Permalink
fix: post rebase pull merge conflict resolution 09/12
Browse files Browse the repository at this point in the history
  • Loading branch information
ymijsters committed Dec 9, 2024
2 parents 7f3ac0f + a01b85a commit f7b17e9
Showing 1 changed file with 24 additions and 4 deletions.
28 changes: 24 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2604,7 +2604,7 @@ __metadata:
languageName: node
linkType: hard

"@mui/utils@npm:^6.1.10, @mui/utils@npm:^6.1.5, @mui/utils@npm:^6.1.6":
"@mui/utils@npm:^6.1.10":
version: 6.1.10
resolution: "@mui/utils@npm:6.1.10"
dependencies:
Expand All @@ -2624,6 +2624,26 @@ __metadata:
languageName: node
linkType: hard

"@mui/utils@npm:^6.1.5, @mui/utils@npm:^6.1.6":
version: 6.1.8
resolution: "@mui/utils@npm:6.1.8"
dependencies:
"@babel/runtime": "npm:^7.26.0"
"@mui/types": "npm:^7.2.19"
"@types/prop-types": "npm:^15.7.13"
clsx: "npm:^2.1.1"
prop-types: "npm:^15.8.1"
react-is: "npm:^18.3.1"
peerDependencies:
"@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
react: ^17.0.0 || ^18.0.0 || ^19.0.0
peerDependenciesMeta:
"@types/react":
optional: true
checksum: 10/093a952ce4834e71911550e7bb17f02fe389b948deefec304c58c1970c5a4c454a44a1ec0a8f426eb294cace410356d2ac0ee4bb5f4628c23cf044399d4258be
languageName: node
linkType: hard

"@nicolo-ribaudo/eslint-scope-5-internals@npm:5.1.1-v1":
version: 5.1.1-v1
resolution: "@nicolo-ribaudo/eslint-scope-5-internals@npm:5.1.1-v1"
Expand Down Expand Up @@ -3267,12 +3287,12 @@ __metadata:
linkType: hard

"@types/react@npm:*":
version: 18.3.6
resolution: "@types/react@npm:18.3.6"
version: 18.3.12
resolution: "@types/react@npm:18.3.12"
dependencies:
"@types/prop-types": "npm:*"
csstype: "npm:^3.0.2"
checksum: 10/ba0d337244347ecbf921de174d9db9bb80b03d41ad3ae7aa65500b3339925852c97e501d7657b5cd629ffed9f7fe3820a63069847e7b8529e4d02934d0f182e9
checksum: 10/c9bbdfeacd5347d2240e0d2cb5336bc57dbc1b9ff557b6c4024b49df83419e4955553518169d3736039f1b62608e15b35762a6c03d49bd86e33add4b43b19033
languageName: node
linkType: hard

Expand Down

0 comments on commit f7b17e9

Please sign in to comment.