From 5336bc8134c0bd2025d6c60cc0bd1542926ba649 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 10 Feb 2017 17:33:22 -0500 Subject: [PATCH] Fixes migrations in CMS develop branch The previous two hotfixes seem to have gotten in the way of this latest migration, so this changeset fixes them and sets things straight again. --- fec/home/migrations/0061_merge_20170210_2230.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 fec/home/migrations/0061_merge_20170210_2230.py diff --git a/fec/home/migrations/0061_merge_20170210_2230.py b/fec/home/migrations/0061_merge_20170210_2230.py new file mode 100644 index 0000000000..7b2c397031 --- /dev/null +++ b/fec/home/migrations/0061_merge_20170210_2230.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2017-02-10 22:30 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('home', '0060_auto_20170209_2030'), + ('home', '0058_auto_20170210_2136'), + ] + + operations = [ + ]