From 679fc9b67664aaf2c3750a61a1ecd6321294e86d Mon Sep 17 00:00:00 2001
From: Ramesh Kumar <ramesh.p@matriotsolutions.com>
Date: Thu, 13 Oct 2022 18:02:03 +0530
Subject: [PATCH] TMSS-1983: Resolved Conflicts
---
.../frontend/tmss_webapp/src/layout/components/AppMenu.js | 5 -----
1 file changed, 5 deletions(-)
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppMenu.js b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppMenu.js
index 40bce7ddc3c..ce2e298d3ee 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppMenu.js
+++ b/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});
--
GitLab