From 72cbca5a2e1263ad691bc7b3c0080691640309ab Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 25 11월 2021 11:18:01 +0900
Subject: [PATCH] 충돌 수정
---
src/main/java/kr/wisestone/owl/domain/Department.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/Department.java b/src/main/java/kr/wisestone/owl/domain/Department.java
index aaf363e..8ec34a2 100644
--- a/src/main/java/kr/wisestone/owl/domain/Department.java
+++ b/src/main/java/kr/wisestone/owl/domain/Department.java
@@ -48,7 +48,7 @@
public void addProjectRole(ProjectRole projectRole) {
if (this.projectRoleDepartments == null) {
- this.projectRoleDepartments = new HashSet<ProjectRoleDepartment>();
+ this.projectRoleDepartments = new HashSet<>();
}
ProjectRoleDepartment projectRoleDepartment = new ProjectRoleDepartment(projectRole, this);
--
Gitblit v1.8.0