From cce0411ee935fd0322003a2601192021be7f66a8 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Sat, 1 Apr 2017 17:37:29 -0300
Subject: [PATCH] Merge both 0048 migrations

---
 kfet/migrations/0049_merge.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 kfet/migrations/0049_merge.py

diff --git a/kfet/migrations/0049_merge.py b/kfet/migrations/0049_merge.py
new file mode 100644
index 00000000..0ce9a525
--- /dev/null
+++ b/kfet/migrations/0049_merge.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('kfet', '0048_article_hidden'),
+        ('kfet', '0048_default_datetime'),
+    ]
+
+    operations = [
+    ]