Merge conflicts

This commit is contained in:
zandercymatics 2024-06-12 08:44:03 -06:00
parent 8d249692f2
commit 836b190822
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
3 changed files with 9 additions and 7 deletions

View file

@ -248,11 +248,6 @@ class DomainRequest(TimeStampedModel):
"School district: a school district that is not part of a local government",
)
@classmethod
def get_branch_label(cls, branch_name: str):
"""Returns the associated label for a given org name"""
return cls(branch_name).label if branch_name else None
class RejectionReasons(models.TextChoices):
DOMAIN_PURPOSE = "purpose_not_met", "Purpose requirements not met"
REQUESTOR = "requestor_not_eligible", "Requestor not eligible to make request"