conflict issue resolved

parcel-bundler · Oct 18, 2018 · bddae15 · bddae15
1 parent d709d92
commit bddae15
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/packages/core/workerfarm/test/mocha.opts b/packages/core/workerfarm/test/mocha.opts