Fix migration conflict after rebase on feature branch

jnovinger · jnovinger · commit 385749c66c02 · 2025-04-10T14:47:23.000-05:00
diff --git a/netbox/ipam/migrations/0079_add_service_fhrp_group_parent_gfk.py b/netbox/ipam/migrations/0079_add_service_fhrp_group_parent_gfk.py
@@ -6,7 +6,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('contenttypes', '0002_remove_content_type_name'),
-        ('ipam', '0077_vlangroup_tenant'),
+        ('ipam', '0078_iprange_mark_utilized'),
     ]
 
     operations = [
diff --git a/netbox/ipam/migrations/0080_populate_service_parent.py b/netbox/ipam/migrations/0080_populate_service_parent.py
@@ -42,7 +42,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('dcim', '0202_location_comments_region_comments_sitegroup_comments'),
-        ('ipam', '0078_add_service_fhrp_group_parent_gfk'),
+        ('ipam', '0079_add_service_fhrp_group_parent_gfk'),
         ('virtualization', '0048_populate_mac_addresses'),
     ]
 
diff --git a/netbox/ipam/migrations/0081_remove_service_device_virtual_machine_add_parent_gfk_index.py b/netbox/ipam/migrations/0081_remove_service_device_virtual_machine_add_parent_gfk_index.py
@@ -6,7 +6,7 @@ class Migration(migrations.Migration):
     dependencies = [
         ('contenttypes', '0002_remove_content_type_name'),
         ('extras', '0125_exporttemplate_file_name'),
-        ('ipam', '0079_populate_service_parent'),
+        ('ipam', '0080_populate_service_parent'),
     ]
 
     operations = [

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ class Migration(migrations.Migration):`
`6`	`6`
`7`	`7`	`dependencies = [`
`8`	`8`	`('contenttypes', '0002_remove_content_type_name'),`
`9`		`- ('ipam', '0077_vlangroup_tenant'),`
	`9`	`+ ('ipam', '0078_iprange_mark_utilized'),`
`10`	`10`	`]`
`11`	`11`
`12`	`12`	`operations = [`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class Migration(migrations.Migration):`
`42`	`42`
`43`	`43`	`dependencies = [`
`44`	`44`	`('dcim', '0202_location_comments_region_comments_sitegroup_comments'),`
`45`		`- ('ipam', '0078_add_service_fhrp_group_parent_gfk'),`
	`45`	`+ ('ipam', '0079_add_service_fhrp_group_parent_gfk'),`
`46`	`46`	`('virtualization', '0048_populate_mac_addresses'),`
`47`	`47`	`]`
`48`	`48`