From 855098e30bcbe1330372cf025663cfd448b1dfa0 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Tue, 5 Jan 2021 00:58:48 +1100
Subject: [PATCH] Merge conflicting migration files

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

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