@@ -0,0 +1,350 @@
+# -*- coding: utf-8 -*-%0A# Generated by Django 1.11.13 on 2018-06-21 18:22%0Afrom __future__ import unicode_literals%0A%0Afrom django.db import migrations%0A%0A%0Aclass Migration(migrations.Migration):%0A%0A    dependencies = %5B%0A        ('osf', '0113_add_view_collectionprovider_to_admin_perm'),%0A        ('osf', '0112_ensure_schemas'),%0A    %5D%0A%0A    operations = %5B%0A    %5D%0A

Add merge migration