Fixed another merge typo

maxpert · Jul 15, 2011 · 9702c92 · 9702c92
1 parent 3fee7e3
commit 9702c92
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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.