From 984d21932559eea25fe73ded79ac733425326bc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20Cz=C3=A9m=C3=A1n?= <trabarni@gmail.com>
Date: Mon, 5 Feb 2018 20:22:09 +0100
Subject: [PATCH] merge migrations
---
.../migrations/0007_merge_20180205_2021.py | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 src/homework/migrations/0007_merge_20180205_2021.py
diff --git a/src/homework/migrations/0007_merge_20180205_2021.py b/src/homework/migrations/0007_merge_20180205_2021.py
new file mode 100644
index 0000000..f48190e
--- /dev/null
+++ b/src/homework/migrations/0007_merge_20180205_2021.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.0.1 on 2018-02-05 19:21
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('homework', '0005_auto_20180126_0135'),
+ ('homework', '0006_auto_20180204_1601'),
+ ]
+
+ operations = [
+ ]
--
GitLab