From acd53c13370870e5cfbf031cb6b00cd5bc7d7454 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Sat, 28 May 2022 12:51:07 +0200
Subject: [PATCH] resolve other merge conflict

---
 pus_tc/tc_packer_hook.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pus_tc/tc_packer_hook.py b/pus_tc/tc_packer_hook.py
index 775a52a..be637d4 100644
--- a/pus_tc/tc_packer_hook.py
+++ b/pus_tc/tc_packer_hook.py
@@ -242,13 +242,8 @@ def pack_service_queue_user(
             tc_queue=service_queue, object_id=RW_ASSEMBLY, op_code=op_code
         )
     if service == CustomServiceList.CONTROLLERS.value:
-<<<<<<< HEAD
         return pack_controller_commands(tc_queue=service_queue, op_code=op_code)
     LOGGER.warning(f"Invalid Service {service}")
-=======
-        return pack_cmd_ctrl_to_prompted_mode(tc_queue=service_queue, op_code=op_code)
-    LOGGER.warning("Invalid Service !")
->>>>>>> origin/develop
 
 
 def create_total_tc_queue_user() -> TcQueueT: