From 0e0f98ed346f0d2a6fb8fbbec49090d183ba996f Mon Sep 17 00:00:00 2001
From: Tiberiu Ichim <tiberiu.ichim@gmail.com>
Date: Fri, 4 Jan 2019 21:38:43 +0200
Subject: Added merge migration

---
 .gitignore                                    |  2 +-
 weblog/migrations/0009_merge_20190104_2123.py | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 weblog/migrations/0009_merge_20190104_2123.py

diff --git a/.gitignore b/.gitignore
index 38278c6..b3b1d45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@ sdist/
 __pycache__/
 *.egg-info
 build/
-*.py
+*.pyc
 
 ### Other ###
 *.log
diff --git a/weblog/migrations/0009_merge_20190104_2123.py b/weblog/migrations/0009_merge_20190104_2123.py
new file mode 100644
index 0000000..5c8ba71
--- /dev/null
+++ b/weblog/migrations/0009_merge_20190104_2123.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.1.3 on 2019-01-04 19:23
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('weblog', '0008_auto_20180329_1316'),
+        ('weblog', '0008_auto_20180531_0329'),
+    ]
+
+    operations = [
+    ]
-- 
cgit v1.2.3