Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/cornell-dti/carriage-web
Browse files Browse the repository at this point in the history
…into dka34/readme_update_desmond
  • Loading branch information
Atikpui007 committed Feb 27, 2024
2 parents 2297967 + 2f645b7 commit 71d3bd4
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 9 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ The **Rider App** branch can be found [here](https://github.com/cornell-dti/carr
- Andrew Choi - Product Manager
- Desmond Atikpui - Technical Project Manager
- Colin Wu - Software Developer
- Raissa Ji - Software Developer
- Selena Liu - Software Developer

**Past Contributors**

Expand Down
17 changes: 10 additions & 7 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-react-hooks": "^4.2.0",
"prettier": "^2.3.2"
"prettier": "2.8.8"
},
"scripts": {
"heroku-postbuild": "npm run build:frontend && npm run build:server",
Expand Down Expand Up @@ -45,4 +45,4 @@
"url": "https://github.com/cornell-dti/carriage-web/issues"
},
"homepage": "https://github.com/cornell-dti/carriage-web#readme"
}
}

0 comments on commit 71d3bd4

Please sign in to comment.