Font family

app/Views/welcome_message.php

@@ -79,7 +79,7 @@
                     <div class="navbar-nav ml-auto">
                         <a class="nav-link active scroll" href="#home-banner">Home</a>
                         <a class="nav-link scroll" href="#services-sec">About</a>
-                        <a class="nav-link scroll" href="#portfolio-area">Work</a>
+                        <!--a class="nav-link scroll" href="#portfolio-area">Work</a-->
                         <a class="nav-link" href="https://blog.float.sg/">Blog</a>
                         <a class="nav-link scroll" href="#contact">Contact Us</a>
                     </div>
@@ -317,7 +317,11 @@
 
 
     <!--Clients Start-->
+<<<<<<< HEAD
     <!--div class="container">
+=======
+    <!-- div class="container">
+>>>>>>> bcc5077f2d53a3d6151c74d9fd3680af7743a82c
         <div class="row no-gutters">
             <div class="col-lg-3 col-md-12 col-sm-12 name">
                 <div class="client-img-holder rounded-circle center-block">
@@ -348,9 +352,14 @@
                 <p class="text-small mb-0">Executive Manager</p>
             </div>
         </div>
+<<<<<<< HEAD
     </!--div>
 
     <!-Clients End-->
+=======
+    </!-->
+    <!--Clients End-->
+>>>>>>> bcc5077f2d53a3d6151c74d9fd3680af7743a82c
 
 
     <!-- Start Contact -->