Merge pull request #146 from lsst-ts/tickets/SITCOM-1770

Fix wrong line in TMA-Restart-MTMount-Operation-Manager-(OM).rst
lsst-ts · Dec 16, 2024 · 3e3b301 · 3e3b301
2 parents 0bffe56 + fc1bdcc
commit 3e3b301
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/...Non-Standard-Operations/MTCS/TMA/TMA-Restart-MTMount-Operation-Manager-(OM).rst b/...Non-Standard-Operations/MTCS/TMA/TMA-Restart-MTMount-Operation-Manager-(OM).rst
@@ -33,10 +33,6 @@ This document outlines the procedure to restart the MTMount Operation Manager (O
 Restarting the OM may be necessary for troubleshooting or maintenance purposes. 
 The OM is responsible for managing various operations related to the telescope mount. 
 
-<<<<<<< HEAD
-=======
-
->>>>>>> 893fb94 (Add AuxTel Troubleshooting summary table)
 .. _TMA-Restart-MTMount-Operation-Manager-Steps:
 
 Procedure Steps