From 3d22c69c7ab03e9aa7e137fd389f408ce36ef4d7 Mon Sep 17 00:00:00 2001
From: decamel <den_spb97@mail.ru>
Date: Fri, 29 Jul 2022 10:05:24 +0300
Subject: [PATCH] Solve conflicts

---
 src/App.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.tsx b/src/App.tsx
index e9d3678..4e529cc 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -15,4 +15,4 @@ function App() {
   );
 }
 
-export default App;
+export default App;
\ No newline at end of file