Resolve merging issues

52037fbb · Fritzie Dianne Del Pilar · 806cd5e0 · 52037fbb · 52037fbb · 52037fbb
Commit 52037fbb authored Mar 05, 2023 by Fritzie Dianne Del Pilar
11 changed files
--- a/widget_CtrlF/db.sqlite3
+++ b/widget_CtrlF/db.sqlite3
--- a/widget_CtrlF/forum/__pycache__/__init__.cpython-39.pyc
+++ b/widget_CtrlF/forum/__pycache__/__init__.cpython-39.pyc
--- a/widget_CtrlF/forum/__pycache__/admin.cpython-39.pyc
+++ b/widget_CtrlF/forum/__pycache__/admin.cpython-39.pyc
--- a/widget_CtrlF/forum/__pycache__/apps.cpython-39.pyc
+++ b/widget_CtrlF/forum/__pycache__/apps.cpython-39.pyc
--- a/widget_CtrlF/forum/__pycache__/models.cpython-39.pyc
+++ b/widget_CtrlF/forum/__pycache__/models.cpython-39.pyc
--- a/widget_CtrlF/forum/__pycache__/urls.cpython-39.pyc
+++ b/widget_CtrlF/forum/__pycache__/urls.cpython-39.pyc
--- a/widget_CtrlF/forum/__pycache__/views.cpython-39.pyc
+++ b/widget_CtrlF/forum/__pycache__/views.cpython-39.pyc
--- a/widget_CtrlF/forum/migrations/__pycache__/0001_initial.cpython-39.pyc
+++ b/widget_CtrlF/forum/migrations/__pycache__/0001_initial.cpython-39.pyc
--- a/widget_CtrlF/forum/migrations/__pycache__/__init__.cpython-39.pyc
+++ b/widget_CtrlF/forum/migrations/__pycache__/__init__.cpython-39.pyc
--- a/widget_CtrlF/widget_CtrlF/__pycache__/settings.cpython-39.pyc
+++ b/widget_CtrlF/widget_CtrlF/__pycache__/settings.cpython-39.pyc
--- a/widget_CtrlF/widget_CtrlF/__pycache__/urls.cpython-39.pyc
+++ b/widget_CtrlF/widget_CtrlF/__pycache__/urls.cpython-39.pyc