From 43fd0b2f59c3aeb2d3f4db10cfad56ee3709d68d Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 15 Mar 2023 11:48:50 +0100
Subject: [PATCH] resolve some more merge conflicts

---
 src/fsfw/pus/CServiceHealthCommanding.h | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/fsfw/pus/CServiceHealthCommanding.h b/src/fsfw/pus/CServiceHealthCommanding.h
index 70023671..2cc16589 100644
--- a/src/fsfw/pus/CServiceHealthCommanding.h
+++ b/src/fsfw/pus/CServiceHealthCommanding.h
@@ -6,11 +6,7 @@
 #include "fsfw/tmtcservices/CommandingServiceBase.h"
 
 struct HealthServiceCfg {
-<<<<<<< HEAD
-  HealthServiceCfg(object_id_t objectId, uint16_t apid, HealthTable &healthTable,
-=======
   HealthServiceCfg(object_id_t objectId, uint16_t apid, object_id_t healthTable,
->>>>>>> upstream/development
                    uint16_t maxNumHealthInfoPerCycle)
       : objectId(objectId),
         apid(apid),
@@ -18,11 +14,7 @@ struct HealthServiceCfg {
         maxNumHealthInfoPerCycle(maxNumHealthInfoPerCycle) {}
   object_id_t objectId;
   uint16_t apid;
-<<<<<<< HEAD
-  HealthTable &table;
-=======
   object_id_t table;
->>>>>>> upstream/development
   uint16_t maxNumHealthInfoPerCycle;
   uint8_t service = 201;
   uint8_t numParallelCommands = 4;
@@ -47,11 +39,8 @@ class CServiceHealthCommanding : public CommandingServiceBase {
  public:
   CServiceHealthCommanding(HealthServiceCfg args);
   ~CServiceHealthCommanding() override = default;
-<<<<<<< HEAD
-=======
 
   ReturnValue_t initialize() override;
->>>>>>> upstream/development
 
  protected:
   /* CSB abstract function implementations */
@@ -70,12 +59,8 @@ class CServiceHealthCommanding : public CommandingServiceBase {
   void doPeriodicOperation() override;
 
  private:
-<<<<<<< HEAD
-  HealthTable &healthTable;
-=======
   const object_id_t healthTableId;
   HealthTable *healthTable;
->>>>>>> upstream/development
   uint16_t maxNumHealthInfoPerCycle = 0;
   bool reportAllHealth = false;
   ReturnValue_t iterateHealthTable(bool reset);