Skip to content

Commit

Permalink
merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
joshuafernandes committed Sep 18, 2024
2 parents 84abcd1 + 171ca20 commit 24bc4e7
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 70 deletions.
24 changes: 0 additions & 24 deletions .github/workflows/dependency_review.yml

This file was deleted.

106 changes: 60 additions & 46 deletions package-lock.json

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

0 comments on commit 24bc4e7

Please sign in to comment.