From 3ea671986cc09ca844fadaf58c94ff09d9bd6aff Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Tue, 3 Nov 2020 21:29:25 +1100
Subject: [PATCH] Merge conflicting migration files

---
 .../part/migrations/0053_merge_20201103_1028.py    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 InvenTree/part/migrations/0053_merge_20201103_1028.py

diff --git a/InvenTree/part/migrations/0053_merge_20201103_1028.py b/InvenTree/part/migrations/0053_merge_20201103_1028.py
new file mode 100644
index 0000000000..d42595675a
--- /dev/null
+++ 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 = [
+    ]