From 7f72d038ffc47f1f7a4a1ea230457e4fa33f18ff Mon Sep 17 00:00:00 2001
From: Karl Hobley <karlhobley10@gmail.com>
Date: Wed, 2 Sep 2015 13:58:33 +0100
Subject: [PATCH] Added merge migration

---
 wagtail/tests/testapp/migrations/0008_merge.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 wagtail/tests/testapp/migrations/0008_merge.py

diff --git a/wagtail/tests/testapp/migrations/0008_merge.py b/wagtail/tests/testapp/migrations/0008_merge.py
new file mode 100644
index 000000000..6e55ced0c
--- /dev/null
+++ b/wagtail/tests/testapp/migrations/0008_merge.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tests', '0007_auto_20150819_0614'),
+        ('tests', '0007_singleeventpage'),
+    ]
+
+    operations = [
+    ]