@@ -0,0 +1,331 @@
+# -*- coding: utf-8 -*-%0A# Generated by Django 1.11.13 on 2018-08-03 14:25%0Afrom __future__ import unicode_literals%0A%0Afrom django.db import migrations%0A%0A%0Aclass Migration(migrations.Migration):%0A%0A    dependencies = %5B%0A        ('osf', '0123_auto_20180726_1546'),%0A        ('osf', '0122_auto_20180801_2105'),%0A    %5D%0A%0A    operations = %5B%0A    %5D%0A

Add merge migration