Add merge migration.

CenterForOpenScience · Nov 13, 2018 · 400c5d0 · 400c5d0
1 parent b8f0476
commit 400c5d0
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/osf/migrations/0148_merge_20181113_0100.py b/osf/migrations/0148_merge_20181113_0100.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.15 on 2018-11-13 01:00
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('osf', '0147_merge_20181108_1643'),
+        ('osf', '0142_remove_waffle_analytics_flags'),
+    ]
+
+    operations = [
+    ]