SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/index.js · 02bb6fe8a938ff91e2b80c8fcf7b34d9b1affd92 · RadioObservatory / LOFAR

4 years ago

Ramesh Kumar authored 4 years ago

# Conflicts:
#	SAS/TMSS/frontend/tmss_webapp/src/App.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/ResourceInputList.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/index.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/view.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/index.js
#	SAS/TMSS/frontend/tmss_webapp/src/services/cycle.service.js

Resolved All Conflicts

82180393

History

Merge branch 'master' into

Ramesh Kumar authored 4 years ago

# Conflicts:
#	SAS/TMSS/frontend/tmss_webapp/src/App.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/ResourceInputList.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/index.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/view.js
#	SAS/TMSS/frontend/tmss_webapp/src/routes/index.js
#	SAS/TMSS/frontend/tmss_webapp/src/services/cycle.service.js

Resolved All Conflicts

Code owners

Assign users and groups as approvers for specific file changes. Learn more.