NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-27 02:48:38 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix migration conflict after rebase on feature branch

Browse Source
This commit is contained in:
Jason Novinger 2025-04-10 14:47:23 -05:00
parent 06aa7eade4
commit 6d13a54743
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/ipam/migrations/0078_add_service_fhrp_group_parent_gfk.py → netbox/ipam/migrations/0079_add_service_fhrp_group_parent_gfk.py
View File

@ -6,7 +6,7 @@ class Migration(migrations.Migration):
dependencies = [ dependencies = [
('contenttypes', '0002_remove_content_type_name'), ('contenttypes', '0002_remove_content_type_name'),
('ipam', '0077_vlangroup_tenant'), ('ipam', '0078_iprange_mark_utilized'),
] ]
operations = [ operations = [

2
netbox/ipam/migrations/0079_populate_service_parent.py → netbox/ipam/migrations/0080_populate_service_parent.py
View File

@ -42,7 +42,7 @@ class Migration(migrations.Migration):
dependencies = [ dependencies = [
('dcim', '0202_location_comments_region_comments_sitegroup_comments'), ('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'), ('virtualization', '0048_populate_mac_addresses'),
] ]

2
netbox/ipam/migrations/0080_remove_service_device_virtual_machine_add_parent_gfk_index.py → netbox/ipam/migrations/0081_remove_service_device_virtual_machine_add_parent_gfk_index.py
View File

@ -6,7 +6,7 @@ class Migration(migrations.Migration):
dependencies = [ dependencies = [
('contenttypes', '0002_remove_content_type_name'), ('contenttypes', '0002_remove_content_type_name'),
('extras', '0125_exporttemplate_file_name'), ('extras', '0125_exporttemplate_file_name'),
('ipam', '0079_populate_service_parent'), ('ipam', '0080_populate_service_parent'),
] ]
operations = [ operations = [