From 25b984c2f7241ea56b527a293884ac01042aea1a Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Fri, 3 Nov 2017 11:33:07 +0100
Subject: [PATCH] Merge migrations
---
.../migrations/0004_merge_20171103_1132.py | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 notifications/migrations/0004_merge_20171103_1132.py
diff --git a/notifications/migrations/0004_merge_20171103_1132.py b/notifications/migrations/0004_merge_20171103_1132.py
new file mode 100644
index 000000000..d1e1181dc
--- /dev/null
+++ b/notifications/migrations/0004_merge_20171103_1132.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-11-03 10:32
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('notifications', '0003_fakeactors'),
+ ('notifications', '0003_notification_pseudo_unread'),
+ ]
+
+ operations = [
+ ]
--
GitLab