resolving merge conflict error

This commit is contained in:
akumarsingh 2020-03-18 15:10:03 -04:00
parent 49aca85e22
commit 85ecd0d4e2

View File

@ -2,7 +2,7 @@ export * from './open-api';
export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>; export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
declare global { declare global {
type Dict<T> = { // type Dict<T> = {
[key: string]: T; // [key: string]: T;
}; // };
} }