From dd1be9fe50a692adae6826b0ae3ed78ba6aef060 Mon Sep 17 00:00:00 2001
From: Robert Einsle <robert@einsle.de>
Date: Fri, 10 Mar 2017 19:54:35 +0100
Subject: [PATCH] merge migrations

---
 billard/migrations/0019_merge_20170310_1941.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 billard/migrations/0019_merge_20170310_1941.py

diff --git a/billard/migrations/0019_merge_20170310_1941.py b/billard/migrations/0019_merge_20170310_1941.py
new file mode 100644
index 0000000..46a2a3f
--- /dev/null
+++ b/billard/migrations/0019_merge_20170310_1941.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-03-10 19:41
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('billard', '0018_auto_20170302_2058'),
+        ('billard', '0017_auto_20170302_1610'),
+    ]
+
+    operations = [
+    ]