Fix merge conflict.

babel · Nov 25, 2020 · c0ac148 · c0ac148
1 parent 1128055
commit c0ac148
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-no-corejs-1/stderr.txt b/packages/babel-preset-env/test/fixtures/debug/usage-no-corejs-1/stderr.txt
@@ -5,9 +5,6 @@ You should also be sure that the version you pass to the `corejs` option matches
 
   npm install --save core-js@2    npm install --save core-js@3
   yarn add core-js@2              yarn add core-js@3
-<<<<<<< HEAD
-=======
 
 More info about useBuiltIns: https://babeljs.io/docs/en/babel-preset-env#usebuiltins
 More info about core-js: https://babeljs.io/docs/en/babel-preset-env#corejs
->>>>>>> Fix specs.