Merge pull request #92 from Lee-Na-eun/dev

[Client] / #22 / app.css : fix css
codestates · Aug 29, 2021 · 6a77168 · 6a77168
2 parents d28d861 + 92d0fc7
commit 6a77168
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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
 }