merged migrations

smash/web/migrations/0136_merge_20190109_1041.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2019-01-09 10:41
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('web', '0135_merge_20190108_1336'),
+        ('web', '0135_merge_20181212_1333'),
+    ]
+
+    operations = [
+    ]