Skip to content

Commit

Permalink
Merge branch 'main' into test
Browse files Browse the repository at this point in the history
  • Loading branch information
Ojas-Arora committed Jul 23, 2024
2 parents 7b4809b + da80675 commit 7e09c55
Show file tree
Hide file tree
Showing 16 changed files with 554 additions and 286 deletions.
142 changes: 75 additions & 67 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@emotion/react": "^11.11.4",
"@emotion/react": "^11.13.0",
"@emotion/styled": "^11.11.5",
"@fortawesome/fontawesome": "^1.1.8",
"@fortawesome/fontawesome-free": "^6.5.2",
Expand All @@ -13,7 +13,7 @@
"@fortawesome/free-brands-svg-icons": "^6.5.2",
"@fortawesome/free-solid-svg-icons": "^6.5.2",
"@fortawesome/react-fontawesome": "^0.2.2",
"@mui/icons-material": "^5.16.1",
"@mui/icons-material": "^5.16.4",
"@react-oauth/google": "^0.12.1",
"@testing-library/jest-dom": "^6.4.6",
"@testing-library/react": "^16.0.0",
Expand Down Expand Up @@ -57,6 +57,6 @@
},
"devDependencies": {
"eslint": "^8.57.0",
"eslint-plugin-react": "^7.34.3"
"eslint-plugin-react": "^7.35.0"
}
}
Loading

0 comments on commit 7e09c55

Please sign in to comment.