Migrations merge, after merge of ARN/flexible-payment

coin/billing/migrations/0010_new_billing_system_data.py

@@ -63,11 +63,10 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('billing', '0009_new_billing_system_schema'),
-        ('members', '0014_member_balance'),
+        ('members', '0016_merge'),
     ]
 
     operations = [
         migrations.RunPython(check_current_state),
         migrations.RunPython(forwards),
     ]
-

coin/members/migrations/0016_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', '0015_auto_20170824_2308'),
+        ('members', '0014_member_balance'),
+    ]
+
+    operations = [
+    ]