mirror of
https://github.com/gchq/CyberChef.git
synced 2025-05-11 16:51:31 -04:00
Fixing the conflicts
This commit is contained in:
parent
6373ad0bc3
commit
e3f63e5aae
1 changed files with 2 additions and 2 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue