Resolve merge issues

widget_CtrlF/forum/migrations/0002_reply_post_alter_forumpost_author_alter_reply_author.py

-<<<<<<< HEAD
-# Generated by Django 4.1.7 on 2023-03-06 02:45
-=======
 # Generated by Django 4.1.7 on 2023-03-05 15:14
->>>>>>> 4f4b6cf6f7366e676cd579dda188e9c9faa9c539
 
 from django.db import migrations, models
 import django.db.models.deletion

widget_CtrlF/forum/migrations/0004_merge_20230515_2025.py

+# Generated by Django 4.2.1 on 2023-05-15 12:25
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('forum', '0002_auto_20230306_0546'),
+        ('forum', '0003_alter_reply_pub_datetime'),
+    ]
+
+    operations = [
+    ]