@@ -0,0 +1,337 @@
+# -*- coding: utf-8 -*-%0A# Generated by Django 1.11.1 on 2017-08-03 16:47%0Afrom __future__ import unicode_literals%0A%0Afrom django.db import migrations%0A%0A%0Aclass Migration(migrations.Migration):%0A%0A    dependencies = %5B%0A        ('osf', '0043_set_share_title'),%0A        ('osf', '0045_add_view_subject_permissions'),%0A    %5D%0A%0A    operations = %5B%0A    %5D%0A

Add merge migration