Merge conflicting migration files

2020-11-03 21:29:25 +11:00 · 2020-11-03 21:29:25 +11:00 · 3ea671986c
parent 083dac1300
commit 3ea671986c
1 changed files with 14 additions and 0 deletions
--- a/InvenTree/part/migrations/0053_merge_20201103_1028.py
+++ b/InvenTree/part/migrations/0053_merge_20201103_1028.py
@ -0,0 +1,14 @@
+# Generated by Django 3.0.7 on 2020-11-03 10:28
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('part', '0052_auto_20201027_1557'),
+        ('part', '0052_partrelated'),
+    ]
+
+    operations = [
+    ]