Resolved cache issues

3524eb24 · Mary Adelaide A. Salto · 893cc13f · 3524eb24 · 3524eb24 · 3524eb24
Commit 3524eb24 authored May 16, 2023 by Mary Adelaide A. Salto
32 changed files
--- a/widget_CtrlF/announcement_board/__pycache__/__init__.cpython-39.pyc
+++ b/widget_CtrlF/announcement_board/__pycache__/__init__.cpython-39.pyc
--- a/widget_CtrlF/announcement_board/__pycache__/views.cpython-39.pyc
+++ b/widget_CtrlF/announcement_board/__pycache__/views.cpython-39.pyc
--- a/widget_CtrlF/announcement_board/migrations/__pycache__/0001_initial.cpython-39.pyc
+++ b/widget_CtrlF/announcement_board/migrations/__pycache__/0001_initial.cpython-39.pyc
--- a/widget_CtrlF/announcement_board/migrations/__pycache__/0002_alter_announcement_body.cpython-39.pyc
+++ b/widget_CtrlF/announcement_board/migrations/__pycache__/0002_alter_announcement_body.cpython-39.pyc
--- a/widget_CtrlF/announcement_board/migrations/__pycache__/0003_alter_announcement_author_and_more.cpython-39.pyc
+++ b/widget_CtrlF/announcement_board/migrations/__pycache__/0003_alter_announcement_author_and_more.cpython-39.pyc
--- a/widget_CtrlF/announcement_board/migrations/__pycache__/__init__.cpython-39.pyc
+++ b/widget_CtrlF/announcement_board/migrations/__pycache__/__init__.cpython-39.pyc
--- a/widget_CtrlF/announcement_board/templates/announcements/announcement-edit.html
+++ b/widget_CtrlF/announcement_board/templates/announcements/announcement-edit.html
@@ -36,11 +36,7 @@ li a:hover {
 <body>
 <ul>
-<<<<<<< HEAD
+    <li><a class="active" href="/announcement_board/">Back</a></li>
-    <li><a class="active" href="/announcement_board/">Announcements</a></li>
-=======
-    <li><a class="active" href="/announcement_board/">Announcement Board</a></li>
->>>>>>> 43a7dbc9324df50f12044741db9be28e324c36fe
    <li><a href="/dashboard/">Dashboard</a></li>
    <li><a href="/forum/">Forum</a></li>
 </ul>

--- a/widget_CtrlF/dashboard/__pycache__/__init__.cpython-39.pyc
+++ b/widget_CtrlF/dashboard/__pycache__/__init__.cpython-39.pyc
--- a/widget_CtrlF/dashboard/__pycache__/admin.cpython-39.pyc
+++ b/widget_CtrlF/dashboard/__pycache__/admin.cpython-39.pyc
--- a/widget_CtrlF/dashboard/__pycache__/apps.cpython-39.pyc
+++ b/widget_CtrlF/dashboard/__pycache__/apps.cpython-39.pyc
--- a/widget_CtrlF/dashboard/__pycache__/models.cpython-39.pyc
+++ b/widget_CtrlF/dashboard/__pycache__/models.cpython-39.pyc
--- a/widget_CtrlF/dashboard/__pycache__/urls.cpython-39.pyc
+++ b/widget_CtrlF/dashboard/__pycache__/urls.cpython-39.pyc
--- a/widget_CtrlF/dashboard/__pycache__/views.cpython-39.pyc
+++ b/widget_CtrlF/dashboard/__pycache__/views.cpython-39.pyc
--- a/widget_CtrlF/dashboard/migrations/__pycache__/0001_initial.cpython-39.pyc
+++ b/widget_CtrlF/dashboard/migrations/__pycache__/0001_initial.cpython-39.pyc
--- a/widget_CtrlF/dashboard/migrations/__pycache__/__init__.cpython-39.pyc
+++ b/widget_CtrlF/dashboard/migrations/__pycache__/__init__.cpython-39.pyc
--- 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/0005_merge_20230516_0419.py
+++ b/widget_CtrlF/forum/migrations/0005_merge_20230516_0419.py
+# Generated by Django 4.2.1 on 2023-05-15 20:19
+from django.db import migrations
+class Migration(migrations.Migration):
+    dependencies = [
+        ('forum', '0004_merge_20230515_2025'),
+        ('forum', '0004_merge_20230516_0026'),
+    ]
+    operations = [
+    ]
--- 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__/0002_auto_20230306_0546.cpython-39.pyc
+++ b/widget_CtrlF/forum/migrations/__pycache__/0002_auto_20230306_0546.cpython-39.pyc
--- a/widget_CtrlF/forum/migrations/__pycache__/0002_reply_post_alter_forumpost_author_alter_reply_author.cpython-39.pyc
+++ b/widget_CtrlF/forum/migrations/__pycache__/0002_reply_post_alter_forumpost_author_alter_reply_author.cpython-39.pyc
--- a/widget_CtrlF/forum/migrations/__pycache__/0003_alter_reply_pub_datetime.cpython-39.pyc
+++ b/widget_CtrlF/forum/migrations/__pycache__/0003_alter_reply_pub_datetime.cpython-39.pyc
--- a/widget_CtrlF/forum/migrations/__pycache__/0004_merge_20230516_0026.cpython-39.pyc
+++ b/widget_CtrlF/forum/migrations/__pycache__/0004_merge_20230516_0026.cpython-39.pyc
--- a/widget_CtrlF/forum/migrations/__pycache__/0005_merge_20230516_0419.cpython-39.pyc
+++ b/widget_CtrlF/forum/migrations/__pycache__/0005_merge_20230516_0419.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/static/style.css
+++ b/widget_CtrlF/static/style.css
@@ -96,7 +96,6 @@ ol {
    text-shadow: 3px 3px 6px black;
 }
-<<<<<<< HEAD
 /* announcement details heading */
 section {
@@ -113,35 +112,3 @@ section {
    font-weight: 700;
 	font-family: 'Dancing Script', cursive;
 }
-/* dashboard pages styles */
-body {
-    background-color: thistle;
-    font-size: 120%;
-    color: black;
-    font-family: 'Sans Serif';
-    text-align: justify;
-}
-h1 {
-    font-family: 'Papyrus';
-    text-align: center;
-}
-=======
-/* announcement details heading */
-section {
-    height: 100vh;
-    background: lightblue;
-}
-  section span {
-    margin: 0;
-    font-size: 400%;
-    text-align: center;
-    line-height: 1;
-    padding-top: calc(50vh - 20pt);
-    display: block;
-    font-weight: 700;
-	font-family: 'Dancing Script', cursive;
-}
->>>>>>> 43a7dbc9324df50f12044741db9be28e324c36fe
--- a/widget_CtrlF/widget_CtrlF/__pycache__/__init__.cpython-39.pyc
+++ b/widget_CtrlF/widget_CtrlF/__pycache__/__init__.cpython-39.pyc
--- a/widget_CtrlF/widget_CtrlF/__pycache__/urls.cpython-39.pyc
+++ b/widget_CtrlF/widget_CtrlF/__pycache__/urls.cpython-39.pyc