merge migrations

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 = [
+    ]