From 1cf6f6f3e71bd2b5a953b649c5e4089b15f31406 Mon Sep 17 00:00:00 2001 From: Ludovic Stephan Date: Tue, 23 Feb 2021 22:41:04 +0100 Subject: [PATCH] Fix migration conflict --- ...t.py => 0075_remove_accountnegative_balance_offset.py} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename kfet/migrations/{0074_remove_accountnegative_balance_offset.py => 0075_remove_accountnegative_balance_offset.py} (50%) diff --git a/kfet/migrations/0074_remove_accountnegative_balance_offset.py b/kfet/migrations/0075_remove_accountnegative_balance_offset.py similarity index 50% rename from kfet/migrations/0074_remove_accountnegative_balance_offset.py rename to kfet/migrations/0075_remove_accountnegative_balance_offset.py index 818adfb1..3bf3134c 100644 --- a/kfet/migrations/0074_remove_accountnegative_balance_offset.py +++ b/kfet/migrations/0075_remove_accountnegative_balance_offset.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.17 on 2021-02-18 16:48 +# Generated by Django 2.2.17 on 2021-02-23 21:40 from django.db import migrations @@ -6,12 +6,12 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ("kfet", "0073_2021"), + ('kfet', '0074_auto_20210219_1337'), ] operations = [ migrations.RemoveField( - model_name="accountnegative", - name="balance_offset", + model_name='accountnegative', + name='balance_offset', ), ]