fix(util-stream-browser): fix typo

aws · Aug 30, 2022 · 27ec3b5 · 27ec3b5
1 parent 15f00e6
commit 27ec3b5
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/packages/util-stream-browser/src/sdk-stream-mixin.ts b/packages/util-stream-browser/src/sdk-stream-mixin.ts
@@ -64,11 +64,7 @@ export const sdkStreamMixin = (stream: unknown): SdkStream<ReadableStream | Blob
       if (isBlobInstance(stream)) {
         // ReadableStream is undefined in React Native
         return blobToWebStream(stream);
-<<<<<<< HEAD
       } else if (isReadableStreamInstance(stream)) {
-=======
-      } else if (isReadableStreamIntance(stream)) {
->>>>>>> a214cc92ce (feat(types): add sdk stream mixin injector type)
         return stream;
       } else {
         throw new Error(`Cannot transform payload to web stream, got ${stream}`);
@@ -79,9 +75,5 @@ export const sdkStreamMixin = (stream: unknown): SdkStream<ReadableStream | Blob
 
 const isBlobInstance = (stream: unknown): stream is Blob => typeof Blob === "function" && stream instanceof Blob;
 
-<<<<<<< HEAD
 const isReadableStreamInstance = (stream: unknown): stream is ReadableStream =>
-=======
-const isReadableStreamIntance = (stream: unknown): stream is ReadableStream =>
->>>>>>> a214cc92ce (feat(types): add sdk stream mixin injector type)
   typeof ReadableStream === "function" && stream instanceof ReadableStream;