From 865bb131a517b7e38671c600ad358165b65f5a12 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 12 May 2017 21:02:48 +0100
Subject: [PATCH] Add merge migration

---
 RIGS/migrations/0031_merge_20170512_2102.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 RIGS/migrations/0031_merge_20170512_2102.py

diff --git a/RIGS/migrations/0031_merge_20170512_2102.py b/RIGS/migrations/0031_merge_20170512_2102.py
new file mode 100644
index 00000000..7056c46b
--- /dev/null
+++ b/RIGS/migrations/0031_merge_20170512_2102.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.1 on 2017-05-12 20:02
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0030_auth_request_sending'),
+        ('RIGS', '0026_auto_20170510_1846'),
+    ]
+
+    operations = [
+    ]