Update style1.css

dishaagarwal04 · Oct 22, 2024 · 7410ab1 · 7410ab1
1 parent 6b0cf71
commit 7410ab1
Showing 1 changed file with 0 additions and 18 deletions.
diff --git a/style1.css b/style1.css
@@ -231,11 +231,6 @@ h1 {
 }
 
 .team-feature {
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-
->>>>>>> origin/ui-fix
   background-color: #e7ffe7;
   padding: 20px;
   display: flex;
@@ -244,19 +239,6 @@ h1 {
   border-radius: 10px;
   box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
   grid-column: 1 / -1;
-<<<<<<< HEAD
-=======
-    background-color: #e7ffe7;
-    padding: 40px 20px;
-    display: flex;
-    align-items: center;
-    text-align: left;
-    border-radius: 10px;
-    box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
-    grid-column: 1 / -1;
->>>>>>> origin/main
-=======
->>>>>>> origin/ui-fix
 }
 
 .team-feature img {