From c83a6554cd6995fc0e69a845dd81026e390a555d Mon Sep 17 00:00:00 2001
From: Chuan-Zheng Lee <czlee@stanford.edu>
Date: Sat, 5 Sep 2020 12:34:06 +1200
Subject: [PATCH] Add merge migration, relates to #1564

---
 .../migrations/0018_merge_20200904_1733.py         | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 tabbycat/participants/migrations/0018_merge_20200904_1733.py

diff --git a/tabbycat/participants/migrations/0018_merge_20200904_1733.py b/tabbycat/participants/migrations/0018_merge_20200904_1733.py
new file mode 100644
index 00000000000..4c345a5ebe7
--- /dev/null
+++ b/tabbycat/participants/migrations/0018_merge_20200904_1733.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.1.1 on 2020-09-05 00:33
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('participants', '0017_auto_20200724_0231'),
+        ('participants', '0016_auto_20200705_1317'),
+    ]
+
+    operations = [
+    ]