merge migrations users

users/migrations/0020_merge.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-10-17 22:15
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0019_auto_20161014_2337'),
+        ('users', '0019_user_is_staff'),
+    ]
+
+    operations = [
+    ]