merge migrations, again

learningequality · Jun 9, 2020 · 4fba502 · 4fba502
1 parent 2801b9c
commit 4fba502
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/kolibri/core/device/migrations/0009_merge_20200608_1716.py b/kolibri/core/device/migrations/0009_merge_20200608_1716.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2020-06-09 00:16
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('device', '0008_merge_20200531_1829'),
+        ('device', '0008_devicesettings_allow_other_browsers_to_connect'),
+    ]
+
+    operations = [
+    ]