From 40fa46a85aae28a9385cade05567464f17d8fee7 Mon Sep 17 00:00:00 2001
From: Arvind Tiwari <tiwariav@gmail.com>
Date: Fri, 9 Feb 2018 02:19:05 +0530
Subject: [PATCH] merge migrations

---
 ungleich_page/migrations/0019_merge.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 ungleich_page/migrations/0019_merge.py

diff --git a/ungleich_page/migrations/0019_merge.py b/ungleich_page/migrations/0019_merge.py
new file mode 100644
index 00000000..1cd6b7f9
--- /dev/null
+++ b/ungleich_page/migrations/0019_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2018-02-08 20:10
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ungleich_page', '0018_ungleichfooter'),
+        ('ungleich_page', '0018_auto_20180105_1826'),
+    ]
+
+    operations = [
+    ]