From 49841a54dbf56c2d4d90b1104acbd02ec5b9828e Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Mon, 23 Jul 2018 18:35:24 +0200
Subject: [PATCH] Fix merge errors.

For some reason I made a merge fiasco between 5.0 and unstable.
This fixes the error introduced by merging unstable.
---
 src/config.c   | 4 ----
 src/t_stream.c | 3 ---
 2 files changed, 7 deletions(-)

diff --git a/src/config.c b/src/config.c
index 8f8d54b8..54494c8e 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1107,10 +1107,6 @@ void configSetCommand(client *c) {
       "stream-node-max-bytes",server.stream_node_max_bytes,0,LONG_MAX) {
     } config_set_numerical_field(
       "stream-node-max-entries",server.stream_node_max_entries,0,LLONG_MAX) {
-    } config_set_numerical_field(
-      "stream-node-max-bytes",server.stream_node_max_bytes,0,LLONG_MAX) {
-    } config_set_numerical_field(
-      "stream-node-max-entries",server.stream_node_max_entries,0,LLONG_MAX) {
     } config_set_numerical_field(
       "list-max-ziplist-size",server.list_max_ziplist_size,INT_MIN,INT_MAX) {
     } config_set_numerical_field(
diff --git a/src/t_stream.c b/src/t_stream.c
index 916c3e78..201509c7 100644
--- a/src/t_stream.c
+++ b/src/t_stream.c
@@ -722,9 +722,6 @@ void streamIteratorRemoveEntry(streamIterator *si, streamID *current) {
     /* Update the number of entries counter. */
     si->stream->length--;
 
-    /* Update the number of entries counter. */
-    si->stream->length--;
-
     /* Re-seek the iterator to fix the now messed up state. */
     streamID start, end;
     if (si->rev) {