Skip to content
Snippets Groups Projects
Commit b001ea34 authored by Ramesh Kumar's avatar Ramesh Kumar
Browse files

Merge branch 'TMSS-242' into TMSS-243

# Conflicts:
#	SAS/TMSS/frontend/tmss_webapp/src/App.css
#	SAS/TMSS/frontend/tmss_webapp/src/App.js
#	SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
#	SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_layout.scss
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Project/index.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/index.js
#	SAS/TMSS/frontend/tmss_webapp/src/services/ScheduleService.js
#	SAS/TMSS/frontend/tmss_webapp/src/utils/unit.converter.js

Resolved Conflicts. Updated styles, links, icons and positions in page header.
parents fad45dae 4df6152e
No related branches found
No related tags found
1 merge request!191Resolve TMSS-243
Showing
with 799 additions and 276 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment