zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-13 04:59:59 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge conflict

Browse source
This commit is contained in:
zandercymatics 2023-12-27 08:07:31 -07:00
parent a696d4789f
commit 46dd9c1b38
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/registrar/admin.py
View file

@ -13,7 +13,6 @@ from django.urls import reverse
from epplibwrapper.errors import ErrorCode, RegistryError from epplibwrapper.errors import ErrorCode, RegistryError
from registrar.models.domain import Domain from registrar.models.domain import Domain
from registrar.models.user import User from registrar.models.user import User
from registrar.models.utility.admin_sort_fields import AdminSortFields
from registrar.utility import csv_export from registrar.utility import csv_export
from . import models from . import models
from auditlog.models import LogEntry # type: ignore from auditlog.models import LogEntry # type: ignore