Resolved merging issues.

c78f6424 · Mary Adelaide A. Salto · ab34088e · c78f6424 · c78f6424 · c78f6424
Commit c78f6424 authored May 16, 2023 by Mary Adelaide A. Salto
3 changed files
--- a/widget_CtrlF/db.sqlite3
+++ b/widget_CtrlF/db.sqlite3
--- a/widget_CtrlF/forum/migrations/0005_merge_20230516_1715.py
+++ b/widget_CtrlF/forum/migrations/0005_merge_20230516_1715.py
+# Generated by Django 4.2.1 on 2023-05-16 09:15
+
+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__/0005_merge_20230516_1715.cpython-39.pyc
+++ b/widget_CtrlF/forum/migrations/__pycache__/0005_merge_20230516_1715.cpython-39.pyc