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

resolve conflicts with master

Browse source
This commit is contained in:
d98762625 2018-11-23 10:54:16 +00:00
parent 0a6d0d1352
commit 97e5e44723
11 changed files with 189 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gruntfile.js
View file

@ -144,7 +144,7 @@ module.exports = function (grunt) {
options: {
configFile: "./.eslintrc.json"
},
configs: ["Gruntfile.js"],
configs: ["*.js"],
core: ["src/core/**/*.{js,mjs}", "!src/core/vendor/**/*", "!src/core/operations/legacy/**/*"],
web: ["src/web/**/*.{js,mjs}"],
node: ["src/node/**/*.{js,mjs}"],