From ffede9cf97ea0305b786631b4164a0ff8ac7a0f4 Mon Sep 17 00:00:00 2001
From: muerwre <gotham48@gmail.com>
Date: Fri, 23 Aug 2019 09:23:52 +0700
Subject: [PATCH] types

---
 src/redux/types.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/redux/types.ts b/src/redux/types.ts
index 1555971e..5fe4e045 100644
--- a/src/redux/types.ts
+++ b/src/redux/types.ts
@@ -113,9 +113,5 @@ export interface INode {
   updatedAt?: string;
 }
 
-<<<<<<< HEAD
-export type IUploadProgressHandler = (progressEvent: any) => void;
-=======
 export type IUploadProgressHandler = (current: number, total: number) => void;
 export type IValidationErrors = Record<string, keyof typeof ERRORS>;
->>>>>>> 148974ab7db3e8500e236e312dd546d39e5c322b