From 5745558f4873b671f1c8a5a252c9be7e73d1af57 Mon Sep 17 00:00:00 2001
From: manueltauber <manuel.tauber@emea.nttdata.com>
Date: Thu, 1 Jun 2023 12:13:23 +0200
Subject: [PATCH] mergeConflicts

---
 .../src/main/java/com/nttdata/calender/changes/ChangeItem.java | 3 ---
 frontend/src/app/data.service.ts                               | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java b/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java
index 8b59598..d1b05d8 100644
--- a/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java
+++ b/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java
@@ -161,7 +161,6 @@ public class ChangeItem {
         this.changeImplementerPersonId = changeImplementerPersonId;
     }
 
-<<<<<<< HEAD
     // /**
     //  * Retrieves the flag indicating whether the change item has a permit.
     //  *
@@ -241,7 +240,6 @@ public class ChangeItem {
     // public void setFlagCancel(boolean flagCancel) {
     //     this.flagCancel = flagCancel;
     // }
-=======
 
     public String getPackageName() {
         return this.packageName;
@@ -250,7 +248,6 @@ public class ChangeItem {
     public void setPackageName(String packageName) {
         this.packageName = packageName;
     }
->>>>>>> KV_and_IH
 
     /**
      * Gets the status reason of the change item.
diff --git a/frontend/src/app/data.service.ts b/frontend/src/app/data.service.ts
index d854e6c..28873fe 100644
--- a/frontend/src/app/data.service.ts
+++ b/frontend/src/app/data.service.ts
@@ -295,7 +295,8 @@ export class DataService {
               flagCancel: resp.flagChancel,
               flagPermit: resp.flagPermit,
               flagReject: resp.flagReject,
-              changeImplementerLogin: resp.changeImplementerLogin
+              changeImplementerLogin: resp.changeImplementerLogin,
+              packageName: resp.packageName
 
             });