From 92d0fc7e026190a2c57fc44ef08e346daa6010e2 Mon Sep 17 00:00:00 2001
From: Lee Naeun <nanni4287@gmail.com>
Date: Sun, 29 Aug 2021 13:58:27 +0900
Subject: [PATCH] :lipstick: [Client] app.css : fix css

---
 client/src/app.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/client/src/app.css b/client/src/app.css
index e66b2d0..3ad76a5 100644
--- a/client/src/app.css
+++ b/client/src/app.css
@@ -117,9 +117,5 @@ footer {
   height: 4.5vh;
   line-height: 4.5vh;
   text-align: center;
-<<<<<<< HEAD
   font-size: max(0.85vw, 11px);
-=======
-  font-size: max(0.9vw, 10px);
->>>>>>> 72bef4e71c5f8079159c860dec0c8ffddb357c70
 }