19 lines
195 B
Plaintext
19 lines
195 B
Plaintext
<<<<<<< HEAD
|
|
db.sqlite3
|
|
venv/*
|
|
media/*
|
|
*.pyc
|
|
__pycache__/
|
|
=======
|
|
# db.sqlite3
|
|
# venv/*
|
|
# media/*
|
|
|
|
__pycache__/
|
|
*.pyc
|
|
|
|
db.sqlite3
|
|
venv/
|
|
.env
|
|
>>>>>>> c28b14f (clean: remove pycache from tracking)
|