From e59f8c30209a44eed0eedc02202ea5466bacf19c Mon Sep 17 00:00:00 2001
From: Carlos Vega <carlos.vega@uni.lu>
Date: Wed, 9 Jan 2019 11:41:29 +0100
Subject: [PATCH] merged migrations
---
smash/web/migrations/0136_merge_20190109_1041.py | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 smash/web/migrations/0136_merge_20190109_1041.py
diff --git a/smash/web/migrations/0136_merge_20190109_1041.py b/smash/web/migrations/0136_merge_20190109_1041.py
new file mode 100644
index 00000000..5f46a33a
--- /dev/null
+++ b/smash/web/migrations/0136_merge_20190109_1041.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2019-01-09 10:41
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('web', '0135_merge_20190108_1336'),
+ ('web', '0135_merge_20181212_1333'),
+ ]
+
+ operations = [
+ ]
--
GitLab