From 45cc672671ba6510c32bb01df758ca09c2948bc0 Mon Sep 17 00:00:00 2001 From: Sung Won Cho Date: Fri, 22 Nov 2019 17:36:38 +0800 Subject: [PATCH] Fix name conflict (#343) --- browser/src/scripts/store/types.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/src/scripts/store/types.ts b/browser/src/scripts/store/types.ts index 49a315d6..fc1bff9d 100644 --- a/browser/src/scripts/store/types.ts +++ b/browser/src/scripts/store/types.ts @@ -17,7 +17,7 @@ */ import { Action } from 'redux'; -import { ThunkAction } from 'redux-thunk'; +import { ThunkAction as ReduxThunkAction } from 'redux-thunk'; import { AuthState } from './auth/types'; import { ComposerState } from './composer/types'; @@ -35,7 +35,7 @@ export interface AppState { } // ThunkAction is a thunk action type -export type ThunkAction = ThunkAction< +export type ThunkAction = ReduxThunkAction< Promise, AppState, void,