From de38ffac9e5450935c5849004821defa1d9150c2 Mon Sep 17 00:00:00 2001
From: Scott Bragg <jsbragg@scriptforge.org>
Date: Sat, 10 Dec 2016 17:07:38 +1100
Subject: [PATCH] Needs an additional migration to merge two 0003 migrations in
 schedule.

---
 symposion/schedule/migrations/0004_merge.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 symposion/schedule/migrations/0004_merge.py

diff --git a/symposion/schedule/migrations/0004_merge.py b/symposion/schedule/migrations/0004_merge.py
new file mode 100644
index 00000000..b89bc7cd
--- /dev/null
+++ b/symposion/schedule/migrations/0004_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-12-10 06:05
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('symposion_schedule', '0003_slot_exclusive'),
+        ('symposion_schedule', '0003_auto_20161113_1530'),
+    ]
+
+    operations = [
+    ]