From 4a5e929ff749cba2f1c4cdbd17d022eb464dd773 Mon Sep 17 00:00:00 2001
From: Tomas Zigo <tomas.zigo@slovanet.sk>
Date: Mon, 6 Apr 2020 06:22:12 +0200
Subject: [PATCH] chore: add merged migration file

---
 apps/aklub/migrations/0069_merge_20200406_0617.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 apps/aklub/migrations/0069_merge_20200406_0617.py

diff --git a/apps/aklub/migrations/0069_merge_20200406_0617.py b/apps/aklub/migrations/0069_merge_20200406_0617.py
new file mode 100644
index 000000000..f4880f232
--- /dev/null
+++ b/apps/aklub/migrations/0069_merge_20200406_0617.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.10 on 2020-04-06 04:17
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('aklub', '0067_merge_20200203_0833'),
+        ('aklub', '0068_auto_20200319_1414'),
+    ]
+
+    operations = [
+    ]