From 0629641ee15a4b798e721976516f8bdcb9739c0f Mon Sep 17 00:00:00 2001
From: devarsheecodess <devarsheegaunekar29@gmail.com>
Date: Mon, 7 Oct 2024 00:03:06 +0530
Subject: [PATCH] Improved manage.html #215

---
 index.html        |  2 +-
 src/css/index.css | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/index.html b/index.html
index 0e555083..3c52e304 100644
--- a/index.html
+++ b/index.html
@@ -425,4 +425,4 @@ <h3 style="color: #ffffff;">Follow Us</h3>
     });
   </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/css/index.css b/src/css/index.css
index 786f26d8..bc6e972e 100644
--- a/src/css/index.css
+++ b/src/css/index.css
@@ -196,23 +196,6 @@ header {
   margin-top: 20px;
 }
 
-<<<<<<< HEAD
-.feature{
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  margin-top: 20px;
-  flex-direction: column;
-  width: 250px;
-}
-
-.grid{
-  display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
-  gap: 45px;
-  margin-top: 20px;
-}
-=======
 
 .features-container {
   display: flex;
@@ -488,5 +471,3 @@ header {
 }
 
 /* Preloader Css Ends */
-
->>>>>>> 31cf09cbf8021a0cf41c63dc9102eef59b21dd85