From d90aa6ab81a59c43e70fa8421b001301e5100bd5 Mon Sep 17 00:00:00 2001
From: DW Wheeler <dw.wheeler@nasa.gov>
Date: Tue, 28 Jan 2025 11:59:24 -0800
Subject: [PATCH] fix formatting

---
 docs/debugging_tab.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/docs/debugging_tab.md b/docs/debugging_tab.md
index 73411803e..d4ee931bc 100644
--- 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