From e3f63e5aaed79ab26e137fe07d0925dbb251a5a2 Mon Sep 17 00:00:00 2001
From: n1073645 <n1073645@gmail.com>
Date: Thu, 13 Feb 2020 17:03:35 +0000
Subject: [PATCH] Fixing the conflicts

---
 src/core/operations/Gunzip.mjs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/operations/Gunzip.mjs b/src/core/operations/Gunzip.mjs
index 32a6dd7c..52efd6d7 100644
--- a/src/core/operations/Gunzip.mjs
+++ b/src/core/operations/Gunzip.mjs
@@ -5,10 +5,10 @@
  */
 
 import Operation from "../Operation.mjs";
-import zlibAndGzip from "zlibjs/bin/zlib_and_gzip.min.js";
 import * as criteria from "../lib/MagicCriteria.mjs";
+import gunzip from "zlibjs/bin/gunzip.min.js";
 
-const Zlib = zlibAndGzip.Zlib;
+const Zlib = gunzip.Zlib;
 
 /**
  * Gunzip operation