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] 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;