From af6aa52a4e9a786fb30d5532b35ccc8c7b741b18 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 17 Jun 2017 22:17:58 +0200
Subject: [PATCH] Merge migrations.

---
 .../comms/migrations/0012_merge_20170617_2017.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 evennia/comms/migrations/0012_merge_20170617_2017.py

diff --git a/evennia/comms/migrations/0012_merge_20170617_2017.py b/evennia/comms/migrations/0012_merge_20170617_2017.py
new file mode 100644
index 0000000000..a91de6d29c
--- /dev/null
+++ b/evennia/comms/migrations/0012_merge_20170617_2017.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.2 on 2017-06-17 20:17
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('comms', '0011_auto_20170606_1731'),
+        ('comms', '0011_auto_20170217_2039'),
+    ]
+
+    operations = [
+    ]