From 05934220513f4cf171b31de45dd57139e17e12e6 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Sat, 25 Mar 2017 10:29:21 +0100
Subject: [PATCH] Fix migration conflict
---
.../migrations/0031_merge_20170325_1028.py | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 submissions/migrations/0031_merge_20170325_1028.py
diff --git a/submissions/migrations/0031_merge_20170325_1028.py b/submissions/migrations/0031_merge_20170325_1028.py
new file mode 100644
index 000000000..f693ca030
--- /dev/null
+++ b/submissions/migrations/0031_merge_20170325_1028.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-03-25 09:28
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0030_auto_20170313_1646'),
+ ('submissions', '0030_auto_20170313_1643'),
+ ]
+
+ operations = [
+ ]
--
GitLab