From 8b57cdd86145d6e17c651b3646133641e65270e2 Mon Sep 17 00:00:00 2001
From: ilyayudovin <ilyayudovin123@gmail.com>
Date: Mon, 15 Jun 2020 18:41:33 +0300
Subject: fix: resolve conflicts

---
 src/types.d.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/types.d.ts')

diff --git a/src/types.d.ts b/src/types.d.ts
index e84f96c..fdb9327 100644
--- a/src/types.d.ts
+++ b/src/types.d.ts
@@ -2,7 +2,9 @@ export interface Page {
   prefix: string;
   id: string;
 }
-
+export interface Authorization {
+  authorize: string;
+}
 export interface User {
   name: string;
   avatarUrl: string;
-- 
cgit v1.2.3


From 171af45318b3c27c232fc7d1aee99976dfb3046e Mon Sep 17 00:00:00 2001
From: ilyayudovin <ilyayudovin123@gmail.com>
Date: Tue, 16 Jun 2020 18:52:58 +0300
Subject: replace interface with simple string for authorization

---
 src/types.d.ts | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/types.d.ts')

diff --git a/src/types.d.ts b/src/types.d.ts
index fdb9327..a62eec8 100644
--- a/src/types.d.ts
+++ b/src/types.d.ts
@@ -2,9 +2,6 @@ export interface Page {
   prefix: string;
   id: string;
 }
-export interface Authorization {
-  authorize: string;
-}
 export interface User {
   name: string;
   avatarUrl: string;
-- 
cgit v1.2.3