Fix git conflicts

gdgoc-ustp · Sep 30, 2024 · dc6ed22 · dc6ed22
1 parent 309f4ee
commit dc6ed22
Showing 1 changed file with 0 additions and 55 deletions.
diff --git a/src/components/footer.css b/src/components/footer.css
@@ -1,58 +1,4 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-.footer{
-    display: flex;
-    color: #ffffff;
-    width: 100%;
-    height: 35vh;
-    background-color: #212121;
-    justify-content: center;
-    align-items: center;
-    flex-direction: column;
-}
-
-.upper {
-    height: 80%;
-    width: 100%;
-    background-color: #EAEAEA;
-}
-
-.lower {
-    height: 20%;
-    width: 100%;
-    background-color: antiquewhite;
-}
-=======
-html, body {
-    height: 100%;
-    margin: 0;
-}
-
-body {
-    display: flex;
-    flex-direction: column;
-}
 
-.footer {
-    display: flex;
-    color: #ffffff;
-    width: 100%;
-    background-color: #212121;
-    justify-content: center;
-    align-items: center;
-    flex-direction: column;
-    margin-top: auto; 
-}
-
-.lower {
-    width: 100%;
-    text-align: center;
-    padding: 25px 0;
-    background: #4285F4;
-    font-weight: 300;
-}
->>>>>>> 8df0d8f447253b5d8401c21e1ad36cdde8b4003d
-=======
 html, body {
     height: 100%;
     margin: 0;
@@ -81,4 +27,3 @@ body {
     background: #4285F4;
     font-weight: 300;
 }
->>>>>>> 8df0d8f447253b5d8401c21e1ad36cdde8b4003d