Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/screen2.0/eslint-8.46.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jordanvelezbomba authored Aug 9, 2023
2 parents 57c3035 + 2c4fa93 commit 7ff7c91
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion screen2.0/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@apollo/experimental-nextjs-app-support": "^0.3.1",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.14.1",
"@mui/icons-material": "^5.14.3",
"@mui/material": "^5.14.2",
"@types/node": "^20.4.4",
"@types/react": "^18.2.14",
Expand Down
10 changes: 5 additions & 5 deletions screen2.0/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -526,9 +526,9 @@ __metadata:
languageName: node
linkType: hard

"@mui/icons-material@npm:^5.14.1":
version: 5.14.1
resolution: "@mui/icons-material@npm:5.14.1"
"@mui/icons-material@npm:^5.14.3":
version: 5.14.3
resolution: "@mui/icons-material@npm:5.14.3"
dependencies:
"@babel/runtime": ^7.22.6
peerDependencies:
Expand All @@ -538,7 +538,7 @@ __metadata:
peerDependenciesMeta:
"@types/react":
optional: true
checksum: d1713a1234dcbdbb3eea77beb43bb6d7a2c8b244991d66711e2e22963959de76cd184ebf0cf1a89417a14fb6cf18940316d87b27442f2b319a7d15c45f6066d8
checksum: 25ff0261dcbcdde9967779f844d12c85c3ffc79227e50d8c03eade1081c2be855e88d2dbe2a587aa57b5c5c2b742af14f70b1767f7ccfd539d89876a6fc580fb
languageName: node
linkType: hard

Expand Down Expand Up @@ -6530,7 +6530,7 @@ __metadata:
"@apollo/experimental-nextjs-app-support": ^0.3.1
"@emotion/react": ^11.11.1
"@emotion/styled": ^11.11.0
"@mui/icons-material": ^5.14.1
"@mui/icons-material": ^5.14.3
"@mui/material": ^5.14.2
"@types/node": ^20.4.4
"@types/react": ^18.2.14
Expand Down

0 comments on commit 7ff7c91

Please sign in to comment.