Merge pull request #71 from hiitarun1/feature/neoneo

Jai-76 · web-flow · commit 8e0ab85d459e · 2025-09-15T20:08:11.000+05:30
fixed broken html of about us page
diff --git a/aboutus.html b/aboutus.html
@@ -3,7 +3,11 @@
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+<<<<<<< HEAD
+<link rel="icon" href="NeoRide.jpeg">
+=======
   <link rel="icon" href="NeoRide.jpeg">
+>>>>>>> 83068bfe9c614068e14cd3ae0f1d64d7d6a543bd
   <title>About NeoRide</title>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Poppins:wght@300;400;500;600;700&display=swap">
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css">
@@ -135,11 +139,17 @@
       align-items: center;
       gap: 8px;
     }
+<<<<<<< HEAD
+    .footer-content p{
+      color: white;
+    }
+=======
 
     .footer-content p {
       color: #f9f8f6;
     }
 
+>>>>>>> 83068bfe9c614068e14cd3ae0f1d64d7d6a543bd
     .footer-links {
       display: flex;
       gap: 20px;
