resolve migratioon conflicts

.drone.yml

@@ -27,8 +27,9 @@ pipeline:
     script:
       - cd /var/www/stage/maidstone-hackspace-website
       - git pull
-      - docker-compose down
+      - docker-compose -fstage.yml build
-      - docker-compose up -d
+      - docker-compose -fstage.yml down
+      - docker-compose -fstage.yml up -d
 
   publish-live:
 #    pull: True

mhackspace/base/migrations/0003_auto_20170215_2146.py

@@ -16,7 +16,7 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.AlterField(
-            model_name='bannerimages',
+            model_name='bannerimage',
             name='scaled_image',
             field=stdimage.models.StdImageField(blank=True, null=True, upload_to=stdimage.utils.UploadToAutoSlugClassNameDir('title'), validators=[stdimage.validators.MinSizeValidator(1200, 300)]),
         ),

mhackspace/base/migrations/0004_merge_20170226_0844.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-02-26 08:44
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0003_auto_20170215_2146'),
+        ('base', '0003_auto_20170222_2055'),
+    ]
+
+    operations = [
+    ]

mhackspace/users/migrations/0003_merge_20170226_0844.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-02-26 08:44
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0002_auto_20170222_2055'),
+        ('users', '0002_user_public'),
+    ]
+
+    operations = [
+    ]