aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiberiu Ichim <tiberiu.ichim@gmail.com>2019-01-04 21:38:43 +0200
committerTiberiu Ichim <tiberiu.ichim@gmail.com>2019-01-04 21:38:43 +0200
commit0e0f98ed346f0d2a6fb8fbbec49090d183ba996f (patch)
tree66db79cb8a464a4c3167ba3c0310832b93f79fe6
parent553a756068220cf5ee3253df358f2a270c5d52d3 (diff)
downloadw3blog-0e0f98ed346f0d2a6fb8fbbec49090d183ba996f.tar.gz
w3blog-0e0f98ed346f0d2a6fb8fbbec49090d183ba996f.zip
Added merge migration
-rw-r--r--.gitignore2
-rw-r--r--weblog/migrations/0009_merge_20190104_2123.py14
2 files changed, 15 insertions, 1 deletions
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 = [
+ ]