@@ -0,0 +1,350 @@
+# -*- coding: utf-8 -*-%0A# Generated by Django 1.11.11 on 2018-05-18 18:37%0Afrom __future__ import unicode_literals%0A%0Afrom django.db import migrations%0A%0A%0Aclass Migration(migrations.Migration):%0A%0A    dependencies = %5B%0A        ('osf', '0103_set_osf_storage_node_settings_region'),%0A        ('osf', '0101_merge_20180514_1932'),%0A    %5D%0A%0A    operations = %5B%0A    %5D%0A

Add new merge migration