Skip to content
Snippets Groups Projects

Resolve "Conflicting migrations detected"

Merged Tom Teichler requested to merge 315-conflicting-migrations-detected into master
1 file
+ 1
1
Compare changes
  • Side-by-side
  • Inline
@@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('core', '0002_school_term'),
('core', '0003_drop_image_cropping'),
]
operations = [
Loading