fix formatting

nasa · Jan 28, 2025 · d90aa6a · d90aa6a
1 parent 1945c7c
commit d90aa6a
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/docs/debugging_tab.md b/docs/debugging_tab.md
@@ -1,12 +1,6 @@
-<<<<<<< HEAD
-# Debugging, Advanced, and Advanced 2 tabs
-
-The Debugging, Advanced, and Advanced 2 tabs have subtabs that display detailed debugging information and allow
-=======
 # Engineering, Other and Debugging tabs
 
 The Engineering, Other and Debugging tabs have subtabs that display detailed debugging information and allow
->>>>>>> master
 engineers to send low-level commands.
 
 ## Debugging Tab