Skip to content

Commit 86d5729

Browse files
committed
resolve migration conflict
#52 bump 0.7.7 to 0.7.8 and release on PyPI
1 parent e5a1265 commit 86d5729

File tree

2 files changed

+7
-24
lines changed

2 files changed

+7
-24
lines changed

django_elastic_migrations/migrations/0007_auto_20181111_1251.py

Lines changed: 0 additions & 21 deletions
This file was deleted.

django_elastic_migrations/migrations/0007_auto_20181112_0937.py renamed to django_elastic_migrations/migrations/0007_auto_20181113_0958.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
# -*- coding: utf-8 -*-
2-
# Generated by Django 1.11 on 2018-11-12 09:37
3-
from __future__ import unicode_literals
1+
# Generated by Django 2.1.3 on 2018-11-13 09:58
42

53
from django.db import migrations, models
4+
import django.db.models.deletion
65

76

87
class Migration(migrations.Migration):
@@ -15,6 +14,11 @@ class Migration(migrations.Migration):
1514
migrations.DeleteModel(
1615
name='DeactivateIndexAction',
1716
),
17+
migrations.AlterField(
18+
model_name='index',
19+
name='active_version',
20+
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='django_elastic_migrations.IndexVersion'),
21+
),
1822
migrations.AlterField(
1923
model_name='indexaction',
2024
name='action',

0 commit comments

Comments
 (0)