zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-27 21:16:28 +02:00
Code Issues Projects Releases Packages Wiki Activity

Commit now saved merge conflict

Browse source
This commit is contained in:
lizpearl 2025-04-11 10:37:40 -05:00
parent 2bebf70394
commit d322c3f645
No known key found for this signature in database
GPG key ID: 29F55F4C8D404E14
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/registrar/models/domain.py
View file

@ -1284,11 +1284,7 @@ class Domain(TimeStampedModel, DomainHelper):
now = timezone.now().date() now = timezone.now().date()
threshold_date = now + timedelta(days=60) threshold_date = now + timedelta(days=60)
<<<<<<< Updated upstream
return now < self.expiration_date <= threshold_date
=======
return now <= self.expiration_date <= threshold_date return now <= self.expiration_date <= threshold_date
>>>>>>> Stashed changes
def state_display(self, request=None): def state_display(self, request=None):
"""Return the display status of the domain.""" """Return the display status of the domain."""