From 28f73b757bbd59e4f5a364d5c7120f02c5ad4cbc Mon Sep 17 00:00:00 2001
From: AADESHak007 <123197632+AADESHak007@users.noreply.github.com>
Date: Fri, 25 Oct 2024 11:34:45 +0530
Subject: [PATCH] merged the changes and resolved conflicts

---
 mentor.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mentor.css b/mentor.css
index cf76572..761a675 100644
--- a/mentor.css
+++ b/mentor.css
@@ -1,7 +1,7 @@
  /* General Styles */
  body {
    font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-  background-color: rgb(220, 218, 218);
+   background-color: rgb(220, 218, 218); /* this color is being added  */
    margin: 0;
    padding: 0;
  }