From 6d13a54743a1ab86e155a2058b5d003e0a92b999 Mon Sep 17 00:00:00 2001
From: Jason Novinger <jnovinger@gmail.com>
Date: Thu, 10 Apr 2025 14:47:23 -0500
Subject: [PATCH] Fix migration conflict after rebase on feature branch

---
 ..._parent_gfk.py => 0079_add_service_fhrp_group_parent_gfk.py} | 2 +-
 ...pulate_service_parent.py => 0080_populate_service_parent.py} | 2 +-
 ...move_service_device_virtual_machine_add_parent_gfk_index.py} | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename netbox/ipam/migrations/{0078_add_service_fhrp_group_parent_gfk.py => 0079_add_service_fhrp_group_parent_gfk.py} (94%)
 rename netbox/ipam/migrations/{0079_populate_service_parent.py => 0080_populate_service_parent.py} (96%)
 rename netbox/ipam/migrations/{0080_remove_service_device_virtual_machine_add_parent_gfk_index.py => 0081_remove_service_device_virtual_machine_add_parent_gfk_index.py} (95%)

diff --git a/netbox/ipam/migrations/0078_add_service_fhrp_group_parent_gfk.py b/netbox/ipam/migrations/0079_add_service_fhrp_group_parent_gfk.py
similarity index 94%
rename from netbox/ipam/migrations/0078_add_service_fhrp_group_parent_gfk.py
rename to netbox/ipam/migrations/0079_add_service_fhrp_group_parent_gfk.py
index 64324fff4..4ae5fd271 100644
--- a/netbox/ipam/migrations/0078_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/0079_populate_service_parent.py b/netbox/ipam/migrations/0080_populate_service_parent.py
similarity index 96%
rename from netbox/ipam/migrations/0079_populate_service_parent.py
rename to netbox/ipam/migrations/0080_populate_service_parent.py
index 8eca438a6..78f3086fc 100644
--- a/netbox/ipam/migrations/0079_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/0080_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
similarity index 95%
rename from netbox/ipam/migrations/0080_remove_service_device_virtual_machine_add_parent_gfk_index.py
rename to netbox/ipam/migrations/0081_remove_service_device_virtual_machine_add_parent_gfk_index.py
index 434e1317a..9cb180037 100644
--- a/netbox/ipam/migrations/0080_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 = [