Skip to content

Commit dbfd7e1

Browse files
committed
Fixes conflict
1 parent 6454087 commit dbfd7e1

File tree

1 file changed

+0
-3
lines changed
  • packages/core/src/js/tools/vendor/metro

1 file changed

+0
-3
lines changed

packages/core/src/js/tools/vendor/metro/utils.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,12 @@ try {
6464
bundleToStringModule = require('metro/src/lib/bundleToString');
6565
}
6666

67-
<<<<<<< HEAD
6867
import type { MetroSerializer } from '../../utils';
69-
=======
7068
const bundleToString: typeof bundleToStringType =
7169
typeof bundleToStringModule === 'function'
7270
? bundleToStringModule
7371
: // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
7472
bundleToStringModule?.bundleToString ?? bundleToStringModule?.default;
75-
>>>>>>> 1b4d7642 (fix(metro): Fixes Metro 0.83.2 breakages (#5206))
7673

7774
type NewSourceMapStringExport = {
7875
// Since Metro v0.80.10 https://github.com/facebook/metro/compare/v0.80.9...v0.80.10#diff-1b836d1729e527a725305eef0cec22e44605af2700fa413f4c2489ea1a03aebcL28

0 commit comments

Comments
 (0)