From 94dc4eb3674d92da7ce6fcad8711ab8776c647c9 Mon Sep 17 00:00:00 2001
From: Cleanroom Laptop L15 <muellerr@irs.uni-stuttgart.de>
Date: Fri, 25 Mar 2022 19:00:19 +0100
Subject: [PATCH] fixed conflicts

---
 common/config/commonObjects.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/common/config/commonObjects.h b/common/config/commonObjects.h
index d5375211..a4f3319e 100644
--- a/common/config/commonObjects.h
+++ b/common/config/commonObjects.h
@@ -90,19 +90,14 @@ enum commonObjects: uint32_t {
     PLOC_UPDATER = 0x44330000,
     PLOC_MEMORY_DUMPER = 0x44330001,
     STR_HELPER = 0x44330002,
-<<<<<<< HEAD
     PLOC_MPSOC_HELPER = 0x44330003,
     AXI_PTME_CONFIG = 44330004,
     PTME_CONFIG = 44330005,
-=======
-    AXI_PTME_CONFIG = 44330003,
-    PTME_CONFIG = 44330004,
 
     // 0x73 ('s') for assemblies and system/subsystem components
     ACS_BOARD_ASS = 0x73000001,
     SUS_BOARD_ASS = 0x73000002,
     TCS_BOARD_ASS = 0x73000003
->>>>>>> develop
 };
 }