merged migrations

smash/web/migrations/0134_merge_20181211_1542.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2018-12-11 15:42
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('web', '0132_workerstudyrole_permissions'),
+        ('web', '0133_auto_20181113_1550'),
+    ]
+
+    operations = [
+    ]