mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-04-21 07:16:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

rebase to current

Browse source
This commit is contained in:
bwhitn 2017-12-17 23:35:34 -05:00
commit 1d3229a729
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/config/modules/Default.js
View file

@ -156,11 +156,15 @@ OpModules.Default = {
"Conditional Jump": FlowControl.runCondJump, "Conditional Jump": FlowControl.runCondJump,
"Return": FlowControl.runReturn, "Return": FlowControl.runReturn,
"Comment": FlowControl.runComment, "Comment": FlowControl.runComment,
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"PHP Deserialize": PHP.runDeserialize, "PHP Deserialize": PHP.runDeserialize,
======= =======
"Arithmetic": Arithmetic.runOp, "Arithmetic": Arithmetic.runOp,
>>>>>>> Added additional arithmetic source >>>>>>> Added additional arithmetic source
=======
"Arithmetic": Arithmetic.runOp,
>>>>>>> 2b47631f4d9c1174ca841005f4cc04c12df7225c
/* /*