From c0100f8ef9b91513dd510dce8e72fadc95d13c48 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 13 Aug 2018 18:08:56 +0200 Subject: Merge migrations --- ishtar_common/migrations/0061_auto_20180704_1225.py | 20 -------------------- ishtar_common/migrations/0062_searchquery.py | 2 +- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 ishtar_common/migrations/0061_auto_20180704_1225.py diff --git a/ishtar_common/migrations/0061_auto_20180704_1225.py b/ishtar_common/migrations/0061_auto_20180704_1225.py deleted file mode 100644 index 55eaea837..000000000 --- a/ishtar_common/migrations/0061_auto_20180704_1225.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2018-07-04 12:25 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('ishtar_common', '0060_auto_20180613_1848'), - ] - - operations = [ - migrations.AlterField( - model_name='document', - name='item_number', - field=models.IntegerField(default=1, verbose_name='Number of items'), - ), - ] diff --git a/ishtar_common/migrations/0062_searchquery.py b/ishtar_common/migrations/0062_searchquery.py index e886fe45a..b6da1f9f5 100644 --- a/ishtar_common/migrations/0062_searchquery.py +++ b/ishtar_common/migrations/0062_searchquery.py @@ -10,7 +10,7 @@ class Migration(migrations.Migration): dependencies = [ ('contenttypes', '0002_remove_content_type_name'), - ('ishtar_common', '0061_auto_20180704_1225'), + ('ishtar_common', '0061_auto_20180813_1729'), ] operations = [ -- cgit v1.2.3