oops

jestjs · Oct 2, 2023 · 09aed7d · 09aed7d
1 parent 0b22568
commit 09aed7d
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/e2e/__tests__/__snapshots__/nativeEsm.test.ts.snap b/e2e/__tests__/__snapshots__/nativeEsm.test.ts.snap
@@ -21,12 +21,7 @@ exports[`on node >=16.12.0 supports import assertions 1`] = `
 Tests:       2 passed, 2 total
 Snapshots:   0 total
 Time:        <<REPLACED>>
-<<<<<<< HEAD
-Ran all test suites matching native-esm-import-assertions.test."
-||||||| b4c9587d19
-Ran all test suites matching /native-esm-import-assertions.test/i."
-=======
-Ran all test suites matching /native-esm-import-assertions.test.js/i."
+Ran all test suites matching native-esm-import-assertions.test.js."
 `;
 
 exports[`properly handle re-exported native modules in ESM via CJS 1`] = `