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

2025-12-10 01:37:23 +02:00
parent 6a9e823402 d7d7a2757a
commit 4051ff5876
13 changed files with 326 additions and 5 deletions
--- a/frontEnd/components/pages/about/AboutBanner.tsx
+++ b/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">