chore: conflict

This commit is contained in:
Timothy J. Baek 2024-01-11 12:51:46 -08:00
parent 8b62d8ac8f
commit bf6685d887
2 changed files with 3 additions and 36 deletions

4
backend/.gitignore vendored
View file

@ -5,4 +5,6 @@ uploads
.ipynb_checkpoints
*.db
_test
Pipfile
Pipfile
/data