From 564f7a5be8401a51c4606a4a0cbf65fa4e5777fb Mon Sep 17 00:00:00 2001
From: Arvind Tiwari <tiwariav@gmail.com>
Date: Fri, 20 Apr 2018 20:36:28 +0530
Subject: [PATCH] merge migrations

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

diff --git a/datacenterlight/migrations/0020_merge.py b/datacenterlight/migrations/0020_merge.py
new file mode 100644
index 00000000..6bbe0086
--- /dev/null
+++ b/datacenterlight/migrations/0020_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2018-04-20 15:04
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('datacenterlight', '0019_auto_20180415_2236'),
+        ('datacenterlight', '0019_cmsfaviconextension'),
+    ]
+
+    operations = [
+    ]