Skip to content

Commit

Permalink
Merge commit '57afff42032e45adb15f35f45f07a420e411dc67' into thinx-st…
Browse files Browse the repository at this point in the history
…aging

# Conflicts:
#	package-lock.json
#	package.json
  • Loading branch information
suculent committed Oct 24, 2024
2 parents c976174 + 57afff4 commit fe96312
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"axios": "^1.7.7",
"base-64": "^0.1.0",
"bcrypt": "^5.0.0",
"body-parser": "^1.19.0",
"body-parser": "^1.20.3",
"brace-expansion": "1.1.11",
"chai": "^4.3.6",
"chai-http": "^4.3.0",
Expand Down

0 comments on commit fe96312

Please sign in to comment.