rebased

Author: scottcrossen

packages-exp/auth-exp/src/api/index.ts

@@ -27,7 +27,6 @@ import {
   ServerError,
   ServerErrorMap
 } from './errors';
-import { Delay } from '../core/util/delay';
 
 export enum HttpMethod {
   POST = 'POST',

packages-exp/auth-exp/src/core/persistence/react_native.ts

@@ -1,10 +1,6 @@
 /**
  * @license
-<<<<<<< HEAD
  * Copyright 2019 Google LLC
-=======
- * Copyright 2019 Google Inc.
->>>>>>> 6b951a1c... Add react native persistence class (#2955)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { ReactNativeAsyncStorage } from '@firebase/auth-types-exp';
 
 import {

packages-exp/auth-exp/src/core/user/user_impl.ts

@@ -49,16 +49,6 @@ function assertStringOrUndefined(
   );
 }
 
-function assertStringOrUndefined(
-  assertion: unknown,
-  appName: string
-): asserts assertion is string | undefined {
-  assert(
-    typeof assertion === 'string' || typeof assertion === 'undefined',
-    appName
-  );
-}
-
 export class UserImpl implements User {
   // For the user object, provider is always Firebase.
   readonly providerId = externs.ProviderId.FIREBASE;

packages-exp/auth-types-exp/index.d.ts

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-<<<<<<< HEAD
 import {
   CompleteFn,
   ErrorFn,
@@ -360,13 +359,10 @@ export interface PhoneInfoOptions {
   // multiFactorHint?: MultiFactorInfo;
 }
 
-=======
->>>>>>> 6b951a1c... Add react native persistence class (#2955)
 export interface ReactNativeAsyncStorage {
   setItem(key: string, value: string): Promise<void>;
   getItem(key: string): Promise<string | null>;
   removeItem(key: string): Promise<void>;
-<<<<<<< HEAD
 }
 
 /**
@@ -414,6 +410,4 @@ export interface UserInfo {
 export interface UserMetadata {
   readonly creationTime?: string;
   readonly lastSignInTime?: string;
-=======
->>>>>>> 6b951a1c... Add react native persistence class (#2955)
 }