TMSS-1983: Resolved Conflicts

SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppMenu.js

@@ -67,16 +67,11 @@ class AppSubmenu extends Component {
         if (!this.props.items) {
             return;
         }
-<<<<<<< HEAD
         let pathname = window.location.pathname;
         if (_.includes(pathname, '/api') && !pathname.endsWith("/")) {
             pathname = pathname + '/';
             window.location.replace(pathname);
         }
-=======
-        const pathname = window.location.pathname;
-        console.log(pathname);
->>>>>>> master
         for (let i = 0; i < this.props.items.length; i++) {
             if (pathname.indexOf(this.props.items[i].section) > -1) {
                 this.setState({activeIndex: i});