Commit 0c44386e authored by Mathieu Bridon's avatar Mathieu Bridon

Merge branch 'fix_migration_conflict' into 'master'

Fix migration conflict.

See merge request !23
parents bbe4b218 22498594
......@@ -11,7 +11,7 @@ class Migration(migrations.Migration):
dependencies = [
('blog', '0014_auto_20171021_1129'),
('mediacenter', '0016_auto_20170921_1402'),
('irfi', '0002_auto_20180119_1617'),
('irfi', '0003_remove_radioshow_duration'),
operations = [
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment