From 11de6f0fb26734c8eafe0754245aa5a098119e9e Mon Sep 17 00:00:00 2001 From: nesnoj Date: Tue, 23 Apr 2024 17:34:18 +0200 Subject: [PATCH] Resolve migration conflict --- ...6_merge_0045_preresults_0045_regionboundaries.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 digiplan/map/migrations/0046_merge_0045_preresults_0045_regionboundaries.py diff --git a/digiplan/map/migrations/0046_merge_0045_preresults_0045_regionboundaries.py b/digiplan/map/migrations/0046_merge_0045_preresults_0045_regionboundaries.py new file mode 100644 index 00000000..4e0d7091 --- /dev/null +++ b/digiplan/map/migrations/0046_merge_0045_preresults_0045_regionboundaries.py @@ -0,0 +1,13 @@ +# Generated by Django 4.2.11 on 2024-04-23 15:29 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("map", "0045_preresults"), + ("map", "0045_regionboundaries"), + ] + + operations = []