mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-05-13 09:36:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixing the conflicts

Browse source
This commit is contained in:
n1073645 2020-02-13 17:03:35 +00:00
parent 6373ad0bc3
commit e3f63e5aae
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/operations/Gunzip.mjs
View file

@ -5,10 +5,10 @@
*/ */
import Operation from "../Operation.mjs"; import Operation from "../Operation.mjs";
import zlibAndGzip from "zlibjs/bin/zlib_and_gzip.min.js";
import * as criteria from "../lib/MagicCriteria.mjs"; 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 * Gunzip operation