resolves merge conflicts

This commit is contained in:
ievgenii vdovenko 2025-12-11 12:16:49 +01:00
parent ba3a08b568
commit bd748e4097
3 changed files with 53 additions and 8 deletions

View file

@ -152,11 +152,50 @@
},
"files": {
"<%= dirs.js.dest %>/scripts.min.js": "<%= dirs.js.dest %>/scripts.js"
}
},
"src": "<%= dirs.js.dest %>/scripts.js",
"dest": "<%= dirs.js.dest %>/scripts.min.js"
},
"ext": {
"options": {
"compress": {
"ecma": 6,
"arrows": false,
"collapse_vars": false,
"comparisons": false,
"computed_props": false,
"hoist_funs": false,
"hoist_props": false,
"hoist_vars": false,
"inline": false,
"loops": false,
"negate_iife": false,
"properties": false,
"reduce_funcs": false,
"reduce_vars": false,
"switches": false,
"toplevel": false,
"typeofs": false,
"booleans": true,
"if_return": true,
"sequences": true,
"unused": true,
"conditionals": true,
"dead_code": true,
"evaluate": true
},
"mangle": {
"keep_classnames": true,
"keep_fnames": false,
"reserved": ["noChange", "nothing"]
},
"output": {
"ecma": 6
}
},
"files": {
"<%= dirs.js.dest %>/scripts.min.js": "<%= dirs.js.dest %>/codemirror-dist.js"
},
"src": "<%= dirs.js.dest %>/codemirror-dist.js",
"dest": "<%= dirs.js.dest %>/codemirror-dist.min.js"
}