Resolving merge conflict

f54451b6 · Teo Quinto · e7be219f · f54451b6 · f54451b6 · f54451b6
Commit f54451b6 authored Mar 23, 2022 by Teo Quinto
5 changed files
--- a/widget_TypeWriterMonkeyCSCIMoment/db.sqlite3
+++ b/widget_TypeWriterMonkeyCSCIMoment/db.sqlite3
--- a/widget_TypeWriterMonkeyCSCIMoment/homepage/__pycache__/admin.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/homepage/__pycache__/admin.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/homepage/__pycache__/models.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/homepage/__pycache__/models.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/homepage/migrations/__pycache__/0001_initial.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/homepage/migrations/__pycache__/0001_initial.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/widget_TypeWriterMonkeyCSCIMoment/__pycache__/settings.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/widget_TypeWriterMonkeyCSCIMoment/__pycache__/settings.cpython-310.pyc