Skip to content

Commit

Permalink
chore(): resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
kamilmysliwiec committed Jul 7, 2022
2 parents 50e4578 + 52950aa commit c2d73f9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions 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 @@ -58,7 +58,7 @@
"cli-color": "2.0.2",
"cors": "2.8.5",
"express": "4.18.1",
"fast-json-stringify": "5.0.1",
"fast-json-stringify": "5.0.6",
"fast-safe-stringify": "2.1.1",
"graphql-subscriptions": "2.0.0",
"iterare": "1.2.1",
Expand Down

0 comments on commit c2d73f9

Please sign in to comment.