From 3004ca80a46d436979a659ee29521c192e7234e5 Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Sun, 7 Jun 2020 17:04:46 -0400
Subject: [PATCH] Fix merge bug

Former-commit-id: cc03c32271997d26ce7f07f96588f126c5939e69
---
 src/expire.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/expire.cpp b/src/expire.cpp
index 961e75393..14c65449d 100644
--- a/src/expire.cpp
+++ b/src/expire.cpp
@@ -156,6 +156,7 @@ void activeExpireCycleExpire(redisDb *db, expireEntry &e, long long now) {
     {
         // We need to resort the expire entry since it may no longer be in the correct position
         db->resortExpire(e);
+    }
 
     if (deleted)
     {