solve merge conficts in readme

This commit is contained in:
Diego Calvo
2021-01-25 14:10:57 +01:00
parent c3c9f54c54
commit afe48992c6
2 changed files with 7 additions and 4 deletions

3
.gitignore vendored
View File

@@ -9,6 +9,9 @@
# environment variables
.env
# virtual env
venv/
# Migrations
**/migrations