From f8e26dcc43064c2c621e5602f801e838293cbe4a Mon Sep 17 00:00:00 2001 From: sarayourfriend Date: Wed, 29 May 2024 11:37:43 +1000 Subject: [PATCH] Rewrite migration after rebase --- ..._privileges.py => 0065_throttledapplication_privileges.py} | 4 ++-- api/latest_migrations/api | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename api/api/migrations/{0064_throttledapplication_privileges.py => 0065_throttledapplication_privileges.py} (86%) diff --git a/api/api/migrations/0064_throttledapplication_privileges.py b/api/api/migrations/0065_throttledapplication_privileges.py similarity index 86% rename from api/api/migrations/0064_throttledapplication_privileges.py rename to api/api/migrations/0065_throttledapplication_privileges.py index 590b0718216..af84cfdeb36 100644 --- a/api/api/migrations/0064_throttledapplication_privileges.py +++ b/api/api/migrations/0065_throttledapplication_privileges.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2.11 on 2024-05-29 01:23 +# Generated by Django 4.2.11 on 2024-05-29 01:37 import django.contrib.postgres.fields from django.db import migrations, models @@ -7,7 +7,7 @@ class Migration(migrations.Migration): dependencies = [ - ('api', '0063_merge_20240521_0843'), + ('api', '0064_define_verbose_names'), ] operations = [ diff --git a/api/latest_migrations/api b/api/latest_migrations/api index ec23aa5e2ea..81926666aad 100644 --- a/api/latest_migrations/api +++ b/api/latest_migrations/api @@ -2,4 +2,4 @@ # If you have a merge conflict in this file, it means you need to run: # manage.py makemigrations --merge # in order to resolve the conflict between migrations. -0064_define_verbose_names +0065_throttledapplication_privileges