.

scripts/custom.js

@@ -91,20 +91,7 @@ jQuery(document).ready(function($){
         }
 
     }
-<<<<<<< HEAD
-
-    //service and industry
-    var loc = window.location;
-    if(loc.pathname.includes("services") && loc.pathname.includes("industries") )
-    {
-        console.log(loc);
-        $(".expand-menu li a[href=" + + "]").addClass("active");
-       
-    }
-        
 
-=======
->>>>>>> 74f7dbf469ac09b92d9e1ad2a20ef7de7fdc9c1c
    //homepage
    var previousLink;
    var indexPeviousSelectedLink = 0;