Fixing the conflicts

This commit is contained in:
n1073645 2020-02-13 17:03:35 +00:00
parent 6373ad0bc3
commit e3f63e5aae

View file

@ -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