From 30b345ddbb4dd90264870dc89a0a68ea4bb15bcb Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Sat, 2 Jul 2011 00:27:10 +0200
Subject: [PATCH] more slow log merge, I forgot to resolve a conflict.

---
 src/redis.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/redis.h b/src/redis.h
index 8ccec13d..22ce0419 100644
--- a/src/redis.h
+++ b/src/redis.h
@@ -404,15 +404,12 @@ struct redisServer {
     long long stat_evictedkeys;     /* number of evicted keys (maxmemory) */
     long long stat_keyspace_hits;   /* number of successful lookups of keys */
     long long stat_keyspace_misses; /* number of failed lookups of keys */
-<<<<<<< HEAD
     size_t stat_peak_memory;        /* max used memory record */
     long long stat_fork_time;       /* time needed to perform latets fork() */
-=======
     list *slowlog;
     long long slowlog_entry_id;
     long long slowlog_log_slower_than;
     unsigned long slowlog_max_len;
->>>>>>> ad6347b... Slowlog backported to 2.2
     /* Configuration */
     int verbosity;
     int maxidletime;