mirror of
https://github.com/gchq/CyberChef.git
synced 2024-09-28 14:31:30 +02:00
rebase to current
This commit is contained in:
commit
1d3229a729
@ -156,11 +156,15 @@ OpModules.Default = {
|
||||
"Conditional Jump": FlowControl.runCondJump,
|
||||
"Return": FlowControl.runReturn,
|
||||
"Comment": FlowControl.runComment,
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"PHP Deserialize": PHP.runDeserialize,
|
||||
=======
|
||||
"Arithmetic": Arithmetic.runOp,
|
||||
>>>>>>> Added additional arithmetic source
|
||||
=======
|
||||
"Arithmetic": Arithmetic.runOp,
|
||||
>>>>>>> 2b47631f4d9c1174ca841005f4cc04c12df7225c
|
||||
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user