diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-07-22 18:22:54 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-07-08 09:58:50 +0200 |
| commit | 102b11cf2cc7fedb60f20c620f882e26f79e6830 (patch) | |
| tree | be1d5429bd5b917baf7becfe0580e8a82515288c /archaeological_files | |
| parent | 3de76c3d54d265ca7fb45c0c9fdbccdee80133c3 (diff) | |
| download | Ishtar-102b11cf2cc7fedb60f20c620f882e26f79e6830.tar.bz2 Ishtar-102b11cf2cc7fedb60f20c620f882e26f79e6830.zip | |
Preventive file: work on inlines - 2
Diffstat (limited to 'archaeological_files')
| -rw-r--r-- | archaeological_files/migrations/0106_auto_20210803_1730.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/archaeological_files/migrations/0106_auto_20210803_1730.py b/archaeological_files/migrations/0106_auto_20210803_1730.py index 7f78e72fe..32c6cb603 100644 --- a/archaeological_files/migrations/0106_auto_20210803_1730.py +++ b/archaeological_files/migrations/0106_auto_20210803_1730.py @@ -1,5 +1,9 @@ # -*- 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 @@ -272,6 +276,7 @@ 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', @@ -297,5 +302,12 @@ 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', + name='parent', + field=models.ForeignKey(blank=True, help_text='Auto-add this cost when a parent is added', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='archaeological_files.EquipmentServiceType', verbose_name='Parent'), ), ] |