Merge conflicting migrations

2021-12-03 00:43:10 +11:00 · 2021-12-03 00:43:10 +11:00 · 732034d9e5
parent 80b615bfb7
commit 732034d9e5
1 changed files with 14 additions and 0 deletions
--- 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
@ -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 = [
+    ]