From 732034d9e540afbc19976ea39281c64bcc03a8f5 Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 3 Dec 2021 00:43:10 +1100 Subject: [PATCH] Merge conflicting migrations --- ...4_auto_20211201_2139_0060_auto_20211129_1339.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 InvenTree/order/migrations/0061_merge_0054_auto_20211201_2139_0060_auto_20211129_1339.py diff --git a/InvenTree/order/migrations/0061_merge_0054_auto_20211201_2139_0060_auto_20211129_1339.py b/InvenTree/order/migrations/0061_merge_0054_auto_20211201_2139_0060_auto_20211129_1339.py new file mode 100644 index 0000000000..e844b0fc23 --- /dev/null +++ b/InvenTree/order/migrations/0061_merge_0054_auto_20211201_2139_0060_auto_20211129_1339.py @@ -0,0 +1,14 @@ +# Generated by Django 3.2.5 on 2021-12-02 13:31 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('order', '0054_auto_20211201_2139'), + ('order', '0060_auto_20211129_1339'), + ] + + operations = [ + ]