Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	dj_shop_cart/cart.py
#	pyproject.toml
  • Loading branch information
@Tobi-De
Tobi-De committed Mar 28, 2023
2 parents f925cc6 + c17cd93 commit f472b3c
Showing 1 changed file with 31 additions and 31 deletions.
62 changes: 31 additions & 31 deletions poetry.lock
View file

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

0 comments on commit f472b3c

Please sign in to comment.