From 593811f24c507ec23e10ccfda234ac52bd8d045f Mon Sep 17 00:00:00 2001
From: lauxley <tissotrobin@gmail.com>
Date: Mon, 20 Jan 2020 11:50:08 +0100
Subject: [PATCH] Fixes migrations conflicts.
---
.../{0037_auto_20191203_1204.py => 0038_auto_20191203_1204.py} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename app/apps/core/migrations/{0037_auto_20191203_1204.py => 0038_auto_20191203_1204.py} (89%)
diff --git a/app/apps/core/migrations/0037_auto_20191203_1204.py b/app/apps/core/migrations/0038_auto_20191203_1204.py
similarity index 89%
rename from app/apps/core/migrations/0037_auto_20191203_1204.py
rename to app/apps/core/migrations/0038_auto_20191203_1204.py
index 5d8ce4ea..7b9a9fa4 100644
--- a/app/apps/core/migrations/0037_auto_20191203_1204.py
+++ b/app/apps/core/migrations/0038_auto_20191203_1204.py
@@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
- ('core', '0036_auto_20191113_1541'),
+ ('core', '0037_create_es_index'),
]
operations = [
--
GitLab