mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-05-14 01:56:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed merge conflict

Browse source
This commit is contained in:
n1474335 2017-02-24 18:14:37 +00:00
commit 11e06eeb75
9 changed files with 363 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/js/config/Categories.js
View file

@ -288,6 +288,7 @@ var Categories = [
"Jump",
"Conditional Jump",
"Return",
"Wait",
]
},
];