Fix merge conflicts

This commit is contained in:
zandercymatics 2024-03-20 09:11:51 -06:00
parent ee66b234cf
commit e0aa729133
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
5 changed files with 160 additions and 168 deletions

View file

@ -1339,6 +1339,8 @@ class TestDomainRequestAdmin(MockEppLib):
"about_your_organization",
"requested_domain",
"approved_domain",
"other_contacts",
"current_websites",
"alternative_domains",
"purpose",
"submitter",