From 09aed7d4c65fcf03f00b7bac3bd5fbd4fb803b21 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Mon, 2 Oct 2023 14:21:48 +0200 Subject: [PATCH] oops --- e2e/__tests__/__snapshots__/nativeEsm.test.ts.snap | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/e2e/__tests__/__snapshots__/nativeEsm.test.ts.snap b/e2e/__tests__/__snapshots__/nativeEsm.test.ts.snap index 2133484b3c4a..96bf4cb3c3f9 100644 --- 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: <> -<<<<<<< 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`] = `