Resolving commit conflict after pulling

d5ac3612 · Teo Quinto · 21fdc362 · d5ac3612 · d5ac3612 · d5ac3612
Commit d5ac3612 authored May 22, 2022 by Teo Quinto
61 changed files
--- a/widget_TypeWriterMonkeyCSCIMoment/announcements/__pycache__/__init__.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/announcements/__pycache__/__init__.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/announcements/__pycache__/admin.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/announcements/__pycache__/admin.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/announcements/__pycache__/apps.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/announcements/__pycache__/apps.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/announcements/__pycache__/forms.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/announcements/__pycache__/forms.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/announcements/__pycache__/models.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/announcements/__pycache__/models.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/announcements/__pycache__/urls.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/announcements/__pycache__/urls.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/announcements/__pycache__/views.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/announcements/__pycache__/views.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/announcements/migrations/__pycache__/0001_initial.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/announcements/migrations/__pycache__/0001_initial.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/announcements/migrations/__pycache__/0002_rename_announcements_announcement.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/announcements/migrations/__pycache__/0002_rename_announcements_announcement.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/announcements/migrations/__pycache__/0003_announcement_author_reaction.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/announcements/migrations/__pycache__/0003_announcement_author_reaction.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/announcements/migrations/__pycache__/0004_remove_reaction_announcement_reaction_announcement.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/announcements/migrations/__pycache__/0004_remove_reaction_announcement_reaction_announcement.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/announcements/migrations/__pycache__/0005_remove_reaction_announcement_reaction_announcement.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/announcements/migrations/__pycache__/0005_remove_reaction_announcement_reaction_announcement.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/announcements/migrations/__pycache__/0006_alter_announcement_pub_date.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/announcements/migrations/__pycache__/0006_alter_announcement_pub_date.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/announcements/migrations/__pycache__/0007_announcement_images.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/announcements/migrations/__pycache__/0007_announcement_images.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/announcements/migrations/__pycache__/0008_alter_announcement_pub_date.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/announcements/migrations/__pycache__/0008_alter_announcement_pub_date.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/announcements/migrations/__pycache__/__init__.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/announcements/migrations/__pycache__/__init__.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/assignments/__pycache__/__init__.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/assignments/__pycache__/__init__.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/assignments/__pycache__/admin.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/assignments/__pycache__/admin.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/assignments/__pycache__/apps.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/assignments/__pycache__/apps.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/assignments/__pycache__/forms.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/assignments/__pycache__/forms.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/assignments/__pycache__/models.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/assignments/__pycache__/models.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/assignments/__pycache__/urls.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/assignments/__pycache__/urls.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/assignments/__pycache__/views.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/assignments/__pycache__/views.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/assignments/migrations/__pycache__/0001_initial.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/assignments/migrations/__pycache__/0001_initial.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/assignments/migrations/__pycache__/0002_course.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/assignments/migrations/__pycache__/0002_course.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/assignments/migrations/__pycache__/0003_assignment_course_assignment_passing_score.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/assignments/migrations/__pycache__/0003_assignment_course_assignment_passing_score.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/assignments/migrations/__pycache__/0004_remove_assignment_passing_score.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/assignments/migrations/__pycache__/0004_remove_assignment_passing_score.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/assignments/migrations/__pycache__/0005_assignment_hw_picture.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/assignments/migrations/__pycache__/0005_assignment_hw_picture.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/assignments/migrations/__pycache__/0006_rename_hw_picture_assignment_hwpicture.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/assignments/migrations/__pycache__/0006_rename_hw_picture_assignment_hwpicture.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/assignments/migrations/__pycache__/__init__.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/assignments/migrations/__pycache__/__init__.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/forum/__pycache__/__init__.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/forum/__pycache__/__init__.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/forum/__pycache__/admin.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/forum/__pycache__/admin.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/forum/__pycache__/apps.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/forum/__pycache__/apps.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/forum/__pycache__/forms.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/forum/__pycache__/forms.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/forum/__pycache__/models.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/forum/__pycache__/models.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/forum/__pycache__/urls.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/forum/__pycache__/urls.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/forum/__pycache__/views.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/forum/__pycache__/views.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/forum/migrations/__pycache__/0001_initial.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/forum/migrations/__pycache__/0001_initial.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/forum/migrations/__pycache__/0002_alter_post_post_body_alter_post_post_title_and_more.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/forum/migrations/__pycache__/0002_alter_post_post_body_alter_post_post_title_and_more.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/forum/migrations/__pycache__/0003_delete_reaction.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/forum/migrations/__pycache__/0003_delete_reaction.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/forum/migrations/__pycache__/0004_post_author_reply.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/forum/migrations/__pycache__/0004_post_author_reply.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/forum/migrations/__pycache__/0005_reply_images.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/forum/migrations/__pycache__/0005_reply_images.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/forum/migrations/__pycache__/0006_remove_reply_images_post_images.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/forum/migrations/__pycache__/0006_remove_reply_images_post_images.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/forum/migrations/__pycache__/0007_alter_post_pub_date_alter_reply_pub_date.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/forum/migrations/__pycache__/0007_alter_post_pub_date_alter_reply_pub_date.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/forum/migrations/__pycache__/__init__.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/forum/migrations/__pycache__/__init__.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/homepage/__pycache__/__init__.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/homepage/__pycache__/__init__.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/homepage/__pycache__/admin.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/homepage/__pycache__/admin.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/homepage/__pycache__/apps.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/homepage/__pycache__/apps.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/homepage/migrations/__pycache__/0002_department.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/homepage/migrations/__pycache__/0002_department.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/homepage/migrations/__pycache__/0003_widgetuser_department_widgetuser_email_and_more.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/homepage/migrations/__pycache__/0003_widgetuser_department_widgetuser_email_and_more.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/homepage/migrations/__pycache__/0004_widgetuser_profile.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/homepage/migrations/__pycache__/0004_widgetuser_profile.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/homepage/migrations/__pycache__/0005_alter_widgetuser_profile.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/homepage/migrations/__pycache__/0005_alter_widgetuser_profile.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/homepage/migrations/__pycache__/0006_alter_widgetuser_profile.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/homepage/migrations/__pycache__/0006_alter_widgetuser_profile.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/homepage/migrations/__pycache__/0007_alter_widgetuser_profile.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/homepage/migrations/__pycache__/0007_alter_widgetuser_profile.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/homepage/migrations/__pycache__/__init__.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/homepage/migrations/__pycache__/__init__.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/widget_TypeWriterMonkeyCSCIMoment/__pycache__/__init__.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/widget_TypeWriterMonkeyCSCIMoment/__pycache__/__init__.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/widget_TypeWriterMonkeyCSCIMoment/__pycache__/settings.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/widget_TypeWriterMonkeyCSCIMoment/__pycache__/settings.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/widget_TypeWriterMonkeyCSCIMoment/__pycache__/urls.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/widget_TypeWriterMonkeyCSCIMoment/__pycache__/urls.cpython-310.pyc
--- a/widget_TypeWriterMonkeyCSCIMoment/widget_TypeWriterMonkeyCSCIMoment/__pycache__/wsgi.cpython-310.pyc
+++ b/widget_TypeWriterMonkeyCSCIMoment/widget_TypeWriterMonkeyCSCIMoment/__pycache__/wsgi.cpython-310.pyc