Add migration file merging migration conflicts

NREL · Feb 9, 2021 · 22ae589 · 22ae589
1 parent 53ad319
commit 22ae589
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/reo/migrations/0102_merge_20210209_1047.py b/reo/migrations/0102_merge_20210209_1047.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.13 on 2021-02-09 17:47
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('reo', '0101_auto_20210127_0151'),
+        ('reo', '0079_auto_20210202_2122'),
+    ]
+
+    operations = [
+    ]