Fix conflict

lsst-ts · May 22, 2024 · 92ed941 · 92ed941
1 parent 9ed1944
commit 92ed941
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/AuxTel/AuxTel-Standard-Operations/AuxTel-Daytime-Operations/Daytime-Checkout.rst b/AuxTel/AuxTel-Standard-Operations/AuxTel-Daytime-Operations/Daytime-Checkout.rst
@@ -91,12 +91,7 @@ track each target for 3 minutes and take a single verification image.
 The mirror covers remain closed during the duration of the script. 
 At the end of the script, the telescope and dome are parked. 
 
-<<<<<<< HEAD
 Check that the verification images pop up in the monitor at `summit's RubinTV`_.
-=======
-Check that the verification images pop up in the monitor (https://summit-lsp.lsst.codes/rubintv/summit/auxtel/monitor_current)
-If either fails, let Merlin know.
->>>>>>> 1875003 (REVIEW: AuxTel Emergency Shutdown)
 
 *auxtel/daytime_checkout/prepare_for/flat.py*
 =============================================