Skip to content

Commit 0714b3a

Browse files
AllanZhengYPkuhe
authored andcommitted
fix(util-stream-browser): fix typo
1 parent 957d0c6 commit 0714b3a

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

packages/util-stream-browser/src/sdk-stream-mixin.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,7 @@ export const sdkStreamMixin = (stream: unknown): SdkStream<ReadableStream | Blob
6464
if (isBlobInstance(stream)) {
6565
// ReadableStream is undefined in React Native
6666
return blobToWebStream(stream);
67-
<<<<<<< HEAD
6867
} else if (isReadableStreamInstance(stream)) {
69-
=======
70-
} else if (isReadableStreamIntance(stream)) {
71-
>>>>>>> a214cc92ce (feat(types): add sdk stream mixin injector type)
7268
return stream;
7369
} else {
7470
throw new Error(`Cannot transform payload to web stream, got ${stream}`);
@@ -79,9 +75,5 @@ export const sdkStreamMixin = (stream: unknown): SdkStream<ReadableStream | Blob
7975

8076
const isBlobInstance = (stream: unknown): stream is Blob => typeof Blob === "function" && stream instanceof Blob;
8177

82-
<<<<<<< HEAD
8378
const isReadableStreamInstance = (stream: unknown): stream is ReadableStream =>
84-
=======
85-
const isReadableStreamIntance = (stream: unknown): stream is ReadableStream =>
86-
>>>>>>> a214cc92ce (feat(types): add sdk stream mixin injector type)
8779
typeof ReadableStream === "function" && stream instanceof ReadableStream;

0 commit comments

Comments
 (0)