From 4a5a61b88ba6112122e8d2517aec8e970ef4a215 Mon Sep 17 00:00:00 2001
From: jeasong <cjs5241@gmail.com>
Date: Thu, 6 May 2021 18:35:49 +0900
Subject: [PATCH 1/2] total test99

---
 src/App.js              | 2 +-
 src/GamePages/InGame.js | 1 -
 src/MyPages/MyPage.js   | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/App.js b/src/App.js
index 859cc24..9f61249 100644
--- a/src/App.js
+++ b/src/App.js
@@ -37,7 +37,7 @@ export default function App() {
     history.push('/Waiting')
   };
 
-  const handleGeuetLogin = () => {
+  const handleGuestLogin = () => {
     setUserInfo({ nickname: '게스트' });
     history.push('/Waiting')
   };
diff --git a/src/GamePages/InGame.js b/src/GamePages/InGame.js
index 36b0021..9305695 100644
--- a/src/GamePages/InGame.js
+++ b/src/GamePages/InGame.js
@@ -1,6 +1,5 @@
 import React, { useState, useEffect, useRef } from 'react';
 import Canvas from './components/Canvas3';
-import ListnerCanvas from './components/ListnerCanvas';
 import Timer from './components/Timer';
 import User from './components/User';
 import BackBtn from './components/BackBtn';
diff --git a/src/MyPages/MyPage.js b/src/MyPages/MyPage.js
index c431453..af2965d 100644
--- a/src/MyPages/MyPage.js
+++ b/src/MyPages/MyPage.js
@@ -3,7 +3,6 @@ import { withRouter } from 'react-router-dom';
 import SearchUser from './components/SearchUser';
 import Header from './components/Header';
 import ChangePsw from './components/ChangePsw';
-import axios from 'axios';
 import Character1 from '../images/Character1.png';
 import Character2 from '../images/Character2.png';
 import Character3 from '../images/Character3.png';

From 38788772ef5390c33f34e8f61157d9b4bcfc8050 Mon Sep 17 00:00:00 2001
From: jeasong <cjs5241@gmail.com>
Date: Thu, 6 May 2021 18:49:13 +0900
Subject: [PATCH 2/2] new dev

---
 src/main.css | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/main.css b/src/main.css
index 55dfe7e..58c13ff 100644
--- a/src/main.css
+++ b/src/main.css
@@ -930,23 +930,15 @@ canvas {
 }
 
 .card {
-<<<<<<< HEAD
-=======
   border: 2px solid #0f4d86;
->>>>>>> b3d2fa2f4bd5a1a35c87b3fda67e7f91c185472c
   background-color: white;
   border-radius: 15px;
   display: flex;
   flex-direction: column;
   align-items: center;
   justify-content: space-between;
-<<<<<<< HEAD
-  border: 5px solid #0f4d86;
-  border-radius: 15px;
-=======
   width: 600px;
   height: 400px;
->>>>>>> b3d2fa2f4bd5a1a35c87b3fda67e7f91c185472c
 }
 .card h1 {
   text-align: center;