Merge branch 'main' of https://git.gnxsoft.com/gnx/GNX-WEB

frontEnd/components/pages/about/AboutBanner.tsx

@@ -227,7 +227,11 @@ const AboutBanner = () => {
 
       {/* Social Links */}
       <div className="social-links">
+<<<<<<< HEAD
         <Link href="https://www.linkedin.com" target="_blank" className="social-link">
+=======
+        <Link href="https://linkedin.com" target="_blank" className="social-link">
+>>>>>>> d7d7a2757a183aa1abd9dbabff804c45298df4e5
           <i className="fa-brands fa-linkedin-in"></i>
         </Link>
         <Link href="https://github.com" target="_blank" className="social-link">

frontEnd/components/pages/career/CareerBanner.tsx

@@ -117,7 +117,11 @@ const CareerBanner = () => {
       <ul className="social">
         <li>
           <Link
+<<<<<<< HEAD
             href="https://www.linkedin.com"
+=======
+            href="https://linkedin.com"
+>>>>>>> d7d7a2757a183aa1abd9dbabff804c45298df4e5
             target="_blank"
             aria-label="connect with us on linkedin"
            >

frontEnd/components/pages/case-study/CaseSingle.tsx

@@ -5,7 +5,10 @@ import Link from "next/link";
 import { useRouter } from "next/navigation";
 import { useCaseStudy } from "@/lib/hooks/useCaseStudy";
 import { getImageUrl } from "@/lib/imageUtils";
+<<<<<<< HEAD
 import { sanitizeHTML } from "@/lib/security/sanitize";
+=======
+>>>>>>> d7d7a2757a183aa1abd9dbabff804c45298df4e5
 
 interface CaseSingleProps {
   slug: string;

frontEnd/components/pages/services/ServicesBanner.tsx

@@ -84,7 +84,11 @@ const ServicesBanner = () => {
       <ul className="social">
         <li>
           <Link
+<<<<<<< HEAD
             href="https://www.linkedin.com"
+=======
+            href="https://linkedin.com"
+>>>>>>> d7d7a2757a183aa1abd9dbabff804c45298df4e5
             target="_blank"
             aria-label="connect with us on linkedin"
            >