Skip to content

Commit

Permalink
Merge branch 'master' into igor/standalone-apm
Browse files Browse the repository at this point in the history
  • Loading branch information
iunanua authored Feb 18, 2025
2 parents 6968166 + f9bf2f5 commit 25c3276
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ export default [
'integration-tests/debugger/target-app/source-map-support/typescript.js', // Generated
'integration-tests/esbuild/out.js', // Generated
'integration-tests/esbuild/aws-sdk-out.js', // Generated
'packages/dd-trace/src/appsec/blocked_templates.js', // TODO Why is this ignored?
'packages/dd-trace/src/payload-tagging/jsonpath-plus.js' // Vendored
]
},
Expand Down
6 changes: 3 additions & 3 deletions packages/dd-trace/src/appsec/blocked_templates.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 25c3276

Please sign in to comment.