merged the changes and resolved conflicts

Code-Social · Oct 25, 2024 · 28f73b7 · 28f73b7
1 parent 8ced553
commit 28f73b7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;
  }