Merge pull request #36 from andela/merge_migrations

Merge multiple leaf nodes in the migration graph
andela · Feb 3, 2019 · 6b793ee · 6b793ee
2 parents 2dcb335 + 1056b3e
commit 6b793ee
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/authors/apps/articles/migrations/0029_merge_20190203_0728.py b/authors/apps/articles/migrations/0029_merge_20190203_0728.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.1.5 on 2019-02-03 07:28
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('articles', '0028_merge_20190202_1446'),
+        ('articles', '0028_merge_20190202_1740'),
+    ]
+
+    operations = [
+    ]