From 9702c92c4fd2e56bd6d16de5c6b367acf1a44e18 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Fri, 15 Jul 2011 18:04:41 +0200
Subject: [PATCH] Fixed another merge typo

---
 src/db.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/db.c b/src/db.c
index 1211af38b..e38466d3b 100644
--- a/src/db.c
+++ b/src/db.c
@@ -495,7 +495,6 @@ void expireGenericCommand(redisClient *c, robj *key, robj *param, long offset) {
         addReply(c,shared.czero);
         return;
     }
-    if (seconds <= 0 && !server.loading) {
     /* EXPIRE with negative TTL, or EXPIREAT with a timestamp into the past
      * should never be executed as a DEL when load the AOF or in the context
      * of a slave instance.