diff --git a/assets/migrations/0011_auto_20200208_2304.py b/assets/migrations/0011_auto_20200208_2304_squashed_0012_auto_20200218_1601.py similarity index 68% rename from assets/migrations/0011_auto_20200208_2304.py rename to assets/migrations/0011_auto_20200208_2304_squashed_0012_auto_20200218_1601.py index 1bdd487f..8351a9b7 100644 --- a/assets/migrations/0011_auto_20200208_2304.py +++ b/assets/migrations/0011_auto_20200208_2304_squashed_0012_auto_20200218_1601.py @@ -1,4 +1,4 @@ -# Generated by Django 2.0.13 on 2020-02-08 23:04 +# Generated by Django 2.0.13 on 2020-02-18 16:02 from django.conf import settings from django.db import migrations, models @@ -7,6 +7,8 @@ import django.db.models.deletion class Migration(migrations.Migration): + replaces = [('assets', '0011_auto_20200208_2304'), ('assets', '0012_auto_20200218_1601')] + dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('assets', '0010_auto_20200207_1737'), @@ -23,4 +25,9 @@ class Migration(migrations.Migration): name='last_audited_by', field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='audited_by', to=settings.AUTH_USER_MODEL), ), + migrations.AlterField( + model_name='asset', + name='csa', + field=models.DecimalField(blank=True, decimal_places=2, help_text='mm²', max_digits=10, null=True), + ), ]