diff options
| -rw-r--r-- | archaeological_files/migrations/0106_auto_20210803_1730.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/archaeological_files/migrations/0106_auto_20210803_1730.py b/archaeological_files/migrations/0106_auto_20210803_1730.py index 32c6cb603..ddf352ffd 100644 --- a/archaeological_files/migrations/0106_auto_20210803_1730.py +++ b/archaeological_files/migrations/0106_auto_20210803_1730.py @@ -1,9 +1,5 @@ # -*- coding: utf-8 -*- -<<<<<<< HEAD:archaeological_files/migrations/0106_auto_20210803_1730.py # Generated by Django 1.11.28 on 2021-08-03 17:30 -======= -# Generated by Django 1.11.28 on 2021-07-26 12:30 ->>>>>>> e3d9f56ac (Preventive file: work on inlines - 2):archaeological_files/migrations/0106_auto_20210726_1230.py from __future__ import unicode_literals import django.core.validators @@ -276,7 +272,6 @@ class Migration(migrations.Migration): model_name='equipmentservicecost', name='equipment_service_type', field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='archaeological_files.EquipmentServiceType', verbose_name='Equipment/Service'), -<<<<<<< HEAD:archaeological_files/migrations/0106_auto_20210803_1730.py ), migrations.AddField( model_name='equipmentservicecost', @@ -302,8 +297,6 @@ class Migration(migrations.Migration): model_name='historicalfile', name='type_of_agreement', field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='archaeological_files.AgreementType', verbose_name='Type of agreement'), -======= ->>>>>>> e3d9f56ac (Preventive file: work on inlines - 2):archaeological_files/migrations/0106_auto_20210726_1230.py ), migrations.AddField( model_name='equipmentservicecost', |