new_contents: # -*- coding: utf-8 -*-
  # Generated by Django 1.10.8 on 2018-12-03 17:05
  from __future__ import unicode_literals
  
  from django.db import migrations, models
  
  
  class Migration(migrations.Migration):
  
      dependencies = [
          ('rdrf', '0091_survey_is_followup.py'),
      ]
  
      operations = [
          migrations.AlterField(
              model_name='emailnotification',
              name='description',
              field=models.CharField(choices=[('account-locked', 'Account Locked'), ('other-clinician', 'Other Clinician'), ('new-patient', 'New Patient Registered'), ('new-patient-parent', 'New Patient Registered (Parent)'), ('account-verified', 'Account Verified'), ('password-expiry-warning', 'Password Expiry Warning'), ('reminder', 'Reminder'), ('clinician-signup-request', 'Clinician Signup Request'), ('clinician-activation', 'Clinician Activation'), ('clinician-selected', 'Clinician Selected'), ('participant-clinician-notification', 'Participant Clinician Notification')], max_length=100),
          ),
      ]
  
subject: fix conflicting migrations