fix: merge problems

webpack · Oct 10, 2020 · 86e6ab7 · 86e6ab7
1 parent b29a1db
commit 86e6ab7
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 41 deletions.
diff --git a/bin/utils/validate-options.js b/bin/utils/validate-options.js
diff --git a/test/binCases/errors/v5-schema-validation/options.js b/test/binCases/errors/v5-schema-validation/options.js
diff --git a/test/binCases/errors/v5-schema-validation/validation.test.js b/test/binCases/errors/v5-schema-validation/validation.test.js