taubem
/
ChangeCalendar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mergeConflicts

main
manueltauber 2023-06-01 12:13:23 +02:00
parent 4cb9c65bea
commit 5745558f48
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java
View File

@ -161,7 +161,6 @@ public class ChangeItem {
this.changeImplementerPersonId = changeImplementerPersonId; this.changeImplementerPersonId = changeImplementerPersonId;
} }
<<<<<<< HEAD
// /** // /**
// * Retrieves the flag indicating whether the change item has a permit. // * Retrieves the flag indicating whether the change item has a permit.
// * // *
@ -241,7 +240,6 @@ public class ChangeItem {
// public void setFlagCancel(boolean flagCancel) { // public void setFlagCancel(boolean flagCancel) {
// this.flagCancel = flagCancel; // this.flagCancel = flagCancel;
// } // }
=======
public String getPackageName() { public String getPackageName() {
return this.packageName; return this.packageName;
@ -250,7 +248,6 @@ public class ChangeItem {
public void setPackageName(String packageName) { public void setPackageName(String packageName) {
this.packageName = packageName; this.packageName = packageName;
} }
>>>>>>> KV_and_IH
/** /**
* Gets the status reason of the change item. * Gets the status reason of the change item.

3
frontend/src/app/data.service.ts
View File

@ -295,7 +295,8 @@ export class DataService {
flagCancel: resp.flagChancel, flagCancel: resp.flagChancel,
flagPermit: resp.flagPermit, flagPermit: resp.flagPermit,
flagReject: resp.flagReject, flagReject: resp.flagReject,
changeImplementerLogin: resp.changeImplementerLogin changeImplementerLogin: resp.changeImplementerLogin,
packageName: resp.packageName
}); });