
from django.db import migrations, models


class Migration(migrations.Migration):

    dependencies = [
        ('workshops', '0220_event_public_status'),
    ]

    operations = [
        migrations.AddField(
            model_name='workshoprequest',
            name='rq_jobs',
            field=models.ManyToManyField(blank=True, help_text='This should be filled out by AMY itself.', to='autoemails.RQJob', verbose_name='Related Redis Queue jobs'),
        ),
    ]


from django.db import migrations, models


class Migration(migrations.Migration):

    dependencies = [
        ('workshops', '0221_auto_20201025_1113'),
    ]

    operations = [
        migrations.AddField(
            model_name='workshoprequest',
            name='rq_jobs',
            field=models.ManyToManyField(blank=True, help_text='This should be filled out by AMY itself.', to='autoemails.RQJob', verbose_name='Related Redis Queue jobs'),
        ),
    ]

Fix migrations conflict after rebase
Fix migrations conflict after rebase

  
  from django.db import migrations, models
  
  
  class Migration(migrations.Migration):
  
      dependencies = [
-         ('workshops', '0220_event_public_status'),
+         ('workshops', '0221_auto_20201025_1113'),
      ]
  
      operations = [
          migrations.AddField(
              model_name='workshoprequest',
              name='rq_jobs',
              field=models.ManyToManyField(blank=True, help_text='This should be filled out by AMY itself.', to='autoemails.RQJob', verbose_name='Related Redis Queue jobs'),
          ),
      ]
  
Fix migrations conflict after rebase
## Code Before:

from django.db import migrations, models


class Migration(migrations.Migration):

    dependencies = [
        ('workshops', '0220_event_public_status'),
    ]

    operations = [
        migrations.AddField(
            model_name='workshoprequest',
            name='rq_jobs',
            field=models.ManyToManyField(blank=True, help_text='This should be filled out by AMY itself.', to='autoemails.RQJob', verbose_name='Related Redis Queue jobs'),
        ),
    ]

## Instruction:
Fix migrations conflict after rebase
## Code After:

from django.db import migrations, models


class Migration(migrations.Migration):

    dependencies = [
        ('workshops', '0221_auto_20201025_1113'),
    ]

    operations = [
        migrations.AddField(
            model_name='workshoprequest',
            name='rq_jobs',
            field=models.ManyToManyField(blank=True, help_text='This should be filled out by AMY itself.', to='autoemails.RQJob', verbose_name='Related Redis Queue jobs'),
        ),
    ]
