Trying to resolve conflicts on my end

e578041c · Bianca Aguilar · 08eb0488 · e578041c · e578041c · e578041c
Commit e578041c authored Mar 21, 2022 by Bianca Aguilar
32 changed files
--- a/announcements/__pycache__/__init__.cpython-310.pyc
+++ b/announcements/__pycache__/__init__.cpython-310.pyc
--- a/announcements/__pycache__/admin.cpython-310.pyc
+++ b/announcements/__pycache__/admin.cpython-310.pyc
--- a/announcements/__pycache__/apps.cpython-310.pyc
+++ b/announcements/__pycache__/apps.cpython-310.pyc
--- a/announcements/__pycache__/models.cpython-310.pyc
+++ b/announcements/__pycache__/models.cpython-310.pyc
--- a/announcements/__pycache__/urls.cpython-310.pyc
+++ b/announcements/__pycache__/urls.cpython-310.pyc
--- a/announcements/__pycache__/views.cpython-310.pyc
+++ b/announcements/__pycache__/views.cpython-310.pyc
--- a/announcements/migrations/__pycache__/0001_initial.cpython-310.pyc
+++ b/announcements/migrations/__pycache__/0001_initial.cpython-310.pyc
--- a/announcements/migrations/__pycache__/__init__.cpython-310.pyc
+++ b/announcements/migrations/__pycache__/__init__.cpython-310.pyc
--- a/assignments/__pycache__/__init__.cpython-310.pyc
+++ b/assignments/__pycache__/__init__.cpython-310.pyc
--- a/assignments/__pycache__/admin.cpython-310.pyc
+++ b/assignments/__pycache__/admin.cpython-310.pyc
--- a/assignments/__pycache__/apps.cpython-310.pyc
+++ b/assignments/__pycache__/apps.cpython-310.pyc
--- a/assignments/__pycache__/models.cpython-310.pyc
+++ b/assignments/__pycache__/models.cpython-310.pyc
--- a/assignments/__pycache__/urls.cpython-310.pyc
+++ b/assignments/__pycache__/urls.cpython-310.pyc
--- a/assignments/__pycache__/views.cpython-310.pyc
+++ b/assignments/__pycache__/views.cpython-310.pyc
--- a/assignments/migrations/__pycache__/0001_initial.cpython-310.pyc
+++ b/assignments/migrations/__pycache__/0001_initial.cpython-310.pyc
--- a/assignments/migrations/__pycache__/__init__.cpython-310.pyc
+++ b/assignments/migrations/__pycache__/__init__.cpython-310.pyc
--- a/forum/__pycache__/__init__.cpython-310.pyc
+++ b/forum/__pycache__/__init__.cpython-310.pyc
--- a/forum/__pycache__/apps.cpython-310.pyc
+++ b/forum/__pycache__/apps.cpython-310.pyc
--- a/forum/__pycache__/urls.cpython-310.pyc
+++ b/forum/__pycache__/urls.cpython-310.pyc
--- a/forum/__pycache__/views.cpython-310.pyc
+++ b/forum/__pycache__/views.cpython-310.pyc
--- a/forum/migrations/__pycache__/__init__.cpython-310.pyc
+++ b/forum/migrations/__pycache__/__init__.cpython-310.pyc
--- a/homepage/__pycache__/__init__.cpython-310.pyc
+++ b/homepage/__pycache__/__init__.cpython-310.pyc
--- a/homepage/__pycache__/admin.cpython-310.pyc
+++ b/homepage/__pycache__/admin.cpython-310.pyc
--- a/homepage/__pycache__/apps.cpython-310.pyc
+++ b/homepage/__pycache__/apps.cpython-310.pyc
--- a/homepage/__pycache__/models.cpython-310.pyc
+++ b/homepage/__pycache__/models.cpython-310.pyc
--- a/homepage/__pycache__/urls.cpython-310.pyc
+++ b/homepage/__pycache__/urls.cpython-310.pyc
--- a/homepage/__pycache__/views.cpython-310.pyc
+++ b/homepage/__pycache__/views.cpython-310.pyc
--- a/homepage/migrations/__pycache__/__init__.cpython-310.pyc
+++ b/homepage/migrations/__pycache__/__init__.cpython-310.pyc
--- a/widget_group_23/__pycache__/__init__.cpython-310.pyc
+++ b/widget_group_23/__pycache__/__init__.cpython-310.pyc
--- a/widget_group_23/__pycache__/settings.cpython-310.pyc
+++ b/widget_group_23/__pycache__/settings.cpython-310.pyc
--- a/widget_group_23/__pycache__/urls.cpython-310.pyc
+++ b/widget_group_23/__pycache__/urls.cpython-310.pyc
--- a/widget_group_23/__pycache__/wsgi.cpython-310.pyc
+++ b/widget_group_23/__pycache__/wsgi.cpython-310.pyc