From d322c3f645bf2d423d228f208f6a9a5530efcdbe Mon Sep 17 00:00:00 2001
From: lizpearl <lizpearl@users.noreply.github.com>
Date: Fri, 11 Apr 2025 10:37:40 -0500
Subject: [PATCH] Commit now saved merge conflict

---
 src/registrar/models/domain.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py
index 85a8a8cd9..7c9a43f57 100644
--- a/src/registrar/models/domain.py
+++ b/src/registrar/models/domain.py
@@ -1284,11 +1284,7 @@ class Domain(TimeStampedModel, DomainHelper):
         now = timezone.now().date()
 
         threshold_date = now + timedelta(days=60)
-<<<<<<< Updated upstream
-        return now < self.expiration_date <= threshold_date
-=======
         return now <= self.expiration_date <= threshold_date
->>>>>>> Stashed changes
 
     def state_display(self, request=None):
         """Return the display status of the domain."""