Resolved merging issues.

eb3066e2 · Mary Adelaide A. Salto · 3524eb24 · eb3066e2 · eb3066e2
Commit eb3066e2 authored May 16, 2023 by Mary Adelaide A. Salto
Showing with 14 additions and 0 deletions

0006_merge_20230516_1922.py widget_CtrlF/forum/migrations/0006_merge_20230516_1922.py +14 -0

0006_merge_20230516_1922.cpython-39.pyc ...tions/__pycache__/0006_merge_20230516_1922.cpython-39.pyc +0 -0

No files found.
--- a/widget_CtrlF/forum/migrations/0006_merge_20230516_1922.py
+++ b/widget_CtrlF/forum/migrations/0006_merge_20230516_1922.py
+# Generated by Django 4.2.1 on 2023-05-16 11:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('forum', '0005_merge_20230516_0419'),
+        ('forum', '0005_merge_20230516_1715'),
+    ]
+
+    operations = [
+    ]
--- a/widget_CtrlF/forum/migrations/__pycache__/0006_merge_20230516_1922.cpython-39.pyc
+++ b/widget_CtrlF/forum/migrations/__pycache__/0006_merge_20230516_1922.cpython-39.pyc