Merging conflict in announcements pycache

cb632069 · Alissandra Gabrielle C. Tanaliga · 60b5c0ec · bfe86064 · cb632069 · cb632069
Commit cb632069 authored Mar 09, 2022 by Alissandra Gabrielle C. Tanaliga
24 changed files
--- a/README.md
+++ b/README.md
 # widget_group 23
+**Bianca Aguilar:**
+ Homepage
+ Forum
+
+**Alissandra Tanaliga:**
+ Announcements
+ Assignments

--- 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__/__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__/admin.cpython-310.pyc
+++ b/forum/__pycache__/admin.cpython-310.pyc
--- a/forum/__pycache__/apps.cpython-310.pyc
+++ b/forum/__pycache__/apps.cpython-310.pyc
--- a/forum/__pycache__/models.cpython-310.pyc
+++ b/forum/__pycache__/models.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__/wsgi.cpython-310.pyc
+++ b/widget_group_23/__pycache__/wsgi.cpython-310.pyc