From 1325621133158604880f9d609646dd29deb09f2a Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 22 Aug 2022 17:19:58 +0200
Subject: [PATCH] resolve merge conflict

---
 tmtc/ploc_supervisor.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/tmtc/ploc_supervisor.py b/tmtc/ploc_supervisor.py
index 5237d94..66e6300 100644
--- a/tmtc/ploc_supervisor.py
+++ b/tmtc/ploc_supervisor.py
@@ -723,7 +723,6 @@ def get_event_buffer_path() -> str:
 
 def handle_supv_hk_data(set_id: int, hk_data: bytes, printer: FsfwTmTcPrinter):
     pw = PrintWrapper(printer)
-<<<<<<< HEAD
     current_idx = 0
     if set_id == SetIds.HK_REPORT:
         pass
@@ -752,17 +751,6 @@ def handle_supv_hk_data(set_id: int, hk_data: bytes, printer: FsfwTmTcPrinter):
         pw.dlog(f"BP0 State {bp_0_state} | BP1 State {bp_1_state} | BP2 State {bp_2_state}")
         pw.dlog(f"Boot State {boot_state} | Boot Cycles {boot_cycles}")
         pw.printer.print_validity_buffer(hk_data[current_idx:], 10)
-    else:
-        pass
-=======
-    if set_id == SetIds.HK_REPORT:
-        # TODO: Implement
-        pass
-    elif set_id == SetIds.BOOT_STATUS_REPORT:
-        # TODO: Implement
-        pass
     else:
         pw.dlog(f"PLOC SUPV: HK handling not implemented for set ID {set_id}")
         pw.dlog(f"Raw Data: 0x[{hk_data.hex(sep=',')}]")
-    pass
->>>>>>> origin/main