Merge conflicting migration files

2021-01-05 00:58:48 +11:00 · 2021-01-05 00:58:48 +11:00 · 855098e30b
parent e715ea5d79
commit 855098e30b
1 changed files with 14 additions and 0 deletions
--- a/InvenTree/part/migrations/0062_merge_20210105_0056.py
+++ b/InvenTree/part/migrations/0062_merge_20210105_0056.py
@ -0,0 +1,14 @@
+# Generated by Django 3.0.7 on 2021-01-04 13:56
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('part', '0061_auto_20210104_2331'),
+        ('part', '0061_auto_20210103_2313'),
+    ]
+
+    operations = [
+    ]