From: Hans Kristian Rosbach <hk-git@circlestorm.org>
Date: Tue, 12 May 2015 21:22:47 +0000 (+0200)
Subject: Fix minor merge conflict
X-Git-Tag: 1.9.9-b1~831
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc5e0d74510daa647df6c365499e3373fd993f2a;p=thirdparty%2Fzlib-ng.git

Fix minor merge conflict
---

diff --git a/test/minigzip.c b/test/minigzip.c
index 23ee92651..4e589c2f7 100644
--- a/test/minigzip.c
+++ b/test/minigzip.c
@@ -109,7 +109,7 @@ gzFile gz_open(const char *path, int fd, const char *mode)
     gz->strm.zalloc = myalloc;
     gz->strm.zfree = myfree;
     gz->strm.opaque = Z_NULL;
-    int level = Z_DEFAULT_COMPRESSION;
+
     const char *plevel = mode;
     while (*plevel) {
         if (*plevel >= '0' && *plevel <= '9') {