RomanNum3ral
/
netbox
mirror of https://github.com/netbox-community/netbox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix dcim/views.py merge error

This commit is contained in:
Daniel Sheppard 2021-11-03 11:36:54 -05:00
parent 76d73abd81
commit cf9eaf2eff
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/dcim/views.py
View File

@ -15,7 +15,7 @@ from django.views.generic import View
from circuits.models import Circuit from circuits.models import Circuit
from extras.views import ObjectChangeLogView, ObjectConfigContextView, ObjectJournalView from extras.views import ObjectChangeLogView, ObjectConfigContextView, ObjectJournalView
from ipam.models import ASN, IPAddress, Prefix, Service, VLAN from ipam.models import ASN, IPAddress, Prefix, Service, VLAN
from ipam.tables import InterfaceIPAddressTable, InterfaceVLANTable from ipam.tables import AssignedIPAddressesTable, InterfaceVLANTable
from netbox.views import generic from netbox.views import generic
from utilities.forms import ConfirmationForm from utilities.forms import ConfirmationForm
from utilities.paginator import EnhancedPaginator, get_paginate_count from utilities.paginator import EnhancedPaginator, get_paginate_count