@@ -0,0 +1,310 @@
+# -*- coding: utf-8 -*-%0Afrom __future__ import unicode_literals%0A%0Afrom django.db import migrations, models%0A%0A%0Aclass Migration(migrations.Migration):%0A%0A    dependencies = %5B%0A        ('events', '0051_sessionregistration_badge_sent'),%0A        ('events', '0051_Add_regestration_team'),%0A    %5D%0A%0A    operations = %5B%0A    %5D%0A

Add merge