merge migration

coin/members/migrations/0019_merge.py

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('members', '0018_auto_20180819_0211'),
+        ('members', '0018_auto_20180818_1855'),
+    ]
+
+    operations = [
+    ]

hardware_provisioning/migrations/0021_merge.py

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hardware_provisioning', '0018_auto_20180819_0211'),
+        ('hardware_provisioning', '0020_auto_20190317_1655'),
+    ]
+
+    operations = [
+    ]