From e409cde9b4fcc873a55baff0611885034e6d77f4 Mon Sep 17 00:00:00 2001
From: Matt Farnsworth <matt@perfectline.co>
Date: Thu, 26 Nov 2015 18:57:16 +0200
Subject: [PATCH] repair bad merge, recover missing code commmit

---
 app/models/epp/domain.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index afdc8e085..80db986ce 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -515,9 +515,8 @@ class Epp::Domain < Domain
     statuses.delete(DomainStatus::PENDING_DELETE_CONFIRMATION)
     statuses.delete(DomainStatus::PENDING_DELETE)
     DomainMailer.delete_confirmation(id, deliver_emails).deliver
-
-    # TODO: confirm that this actually makes sense
-    clean_pendings! if valid? && set_pending_delete!
+    clean_pendings!
+    set_pending_delete!
     true
   end