resolve merge conflicts

This commit is contained in:
Jeremy Long
2017-12-09 07:03:33 -05:00
4 changed files with 156 additions and 72 deletions

View File

@@ -127,5 +127,7 @@ analyzer.vulnerabilitysuppression.enabled=true
updater.nvdcve.enabled=true
updater.versioncheck.enabled=true
analyzer.versionfilter.enabled=true
ecosystem.skip.cpeanalyzer=npm
database.batchinsert.enabled=true
database.batchinsert.maxsize=1000
ecosystem.skip.cpeanalyzer=npm