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

Merge branch 'TMSS-222' into TMSS-216 

# Conflicts:
#	SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.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/Scheduling/index.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Task/index.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/index.js

Conflicts resolved.

Custom Field for pointing angles, duration updated with validation
parents 0f50ddb9 384094d5
No related branches found
No related tags found
1 merge request!191Resolve TMSS-243
Hide whitespace changes
Inline Side-by-side
Showing
with 387 additions and 185 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment