Skip to content

Commit

Permalink
fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@TheRealAmazonKendra
TheRealAmazonKendra committed Aug 29, 2024
2 parents 463f0c5 + 6d43917 commit 1aa3adf
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions yarn.lock
View file

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

0 comments on commit 1aa3adf

Please sign in to comment.