Skip to content
Commit 964a402e authored by Fang Yuedong's avatar Fang Yuedong
Browse files

Merge remote-tracking branch 'origin/sim_scheduler' into sim_scheduler 

Conflicts:
	ObservationSim/Config/Pointing.py
	config/obs_config_SCI_WIDE_phot.yaml
parents 524d234b 86cb9fdb
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment