resolved migration

Sarthak5598 · Aug 13, 2024 · e80954f · e80954f
1 parent 5528254
commit e80954f
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 73 deletions.
diff --git a/website/migrations/0125_blockedip.py b/website/migrations/0125_blockedip.py
diff --git a/website/migrations/0126_merge_0125_activitylog_timelog_0125_blockedip.py b/website/migrations/0126_merge_0125_activitylog_timelog_0125_blockedip.py
diff --git a/...grations/0127_blocked_delete_blockedip.py → website/migrations/0129_blocked.py b/...grations/0127_blocked_delete_blockedip.py → website/migrations/0129_blocked.py
@@ -1,11 +1,11 @@
-# Generated by Django 5.1 on 2024-08-11 07:03
+# Generated by Django 5.1 on 2024-08-13 08:55
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("website", "0126_merge_0125_activitylog_timelog_0125_blockedip"),
+        ("website", "0128_userprofile_discounted_hourly_rate_and_more"),
     ]
 
     operations = [
@@ -35,7 +35,4 @@ class Migration(migrations.Migration):
                 ("created", models.DateField(blank=True, null=True)),
             ],
         ),
-        migrations.DeleteModel(
-            name="BlockedIP",
-        ),
     ]
diff --git a/website/migrations/0129_merge_20240812_2313.py b/website/migrations/0129_merge_20240812_2313.py