Merge pull request #99 from cjs1301/dev2

Dev2
codestates · May 6, 2021 · d48b975 · d48b975
2 parents 97d2009 + 3878877
commit d48b975
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git 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/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';

diff --git 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;