Additional merge conflicts

This commit is contained in:
zandercymatics 2024-03-12 15:54:03 -06:00
parent 5661174a2d
commit 0f0ce6be53
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
3 changed files with 6 additions and 6 deletions

View file

@ -777,7 +777,7 @@ class DomainRequest(TimeStampedModel):
conditions=[investigator_exists_and_is_staff],
)
def approve(self, send_email=True):
"""Approve an domain_request that has been submitted.
"""Approve an domain request that has been submitted.
This action cleans up the rejection status if moving away from rejected.