@@ -0,0 +1,333 @@
+# -*- coding: utf-8 -*-%0A# Generated by Django 1.11.15 on 2018-10-25 14:35%0Afrom __future__ import unicode_literals%0A%0Afrom django.db import migrations%0A%0A%0Aclass Migration(migrations.Migration):%0A%0A    dependencies = %5B%0A        ('osf', '0139_merge_20181019_1337'),%0A        ('osf', '0141_merge_20181023_1526'),%0A    %5D%0A%0A    operations = %5B%0A    %5D%0A

Add merge migration