-
Federico Montesino Pouzols authored
Fixed conflicts with last few days changes in master, especially with InstrumentWidget files that have been moved and revamped, re #15246.
f2dadc47
Admins will be upgrading ORNL GitLab Servers on Monday, 13 May 2024, from 5 PM until 7 PM EST. Repositories will experience intermittent outages during this time.
Fixed conflicts with last few days changes in master, especially with InstrumentWidget files that have been moved and revamped, re #15246.