managing merge errors

Author: belledw

server/server/settings.py

@@ -48,7 +48,6 @@
     "rest_framework",
     "corsheaders",
     "healthcheck",
-    "feedback",
     "user_profile",
     "pet.apps.PetConfig",
     "tasks.apps.TasksConfig",

server/user_profile/migrations/0003_merge_20251206_0616.py

@@ -0,0 +1,14 @@
+# Generated by Django 5.2.8 on 2025-12-06 06:16
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user_profile', '0002_alter_profile_age_alter_profile_bio'),
+        ('user_profile', '0002_alter_profile_bio'),
+    ]
+
+    operations = [
+    ]