From 7410ab1cfb7494c89bec597b9f526474b19fe519 Mon Sep 17 00:00:00 2001
From: Ankul Maddheshiya <ankulmaddheshiyanew@gmail.com>
Date: Tue, 22 Oct 2024 20:41:05 +0530
Subject: [PATCH] Update style1.css

---
 style1.css | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/style1.css b/style1.css
index 9cb8610..79118df 100644
--- 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 {