[FIX] 충돌 처리되지 않은 부분 수정

hufscheer · Sep 20, 2024 · e3bef92 · e3bef92
1 parent 2a32272
commit e3bef92
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/main/java/com/sports/server/command/league/dto/LeagueRequestDto.java b/src/main/java/com/sports/server/command/league/dto/LeagueRequestDto.java
@@ -15,13 +15,8 @@ public record Register(
 		LocalDateTime startAt,
 		LocalDateTime endAt
 	) {
-<<<<<<< Updated upstream
-		public League toEntity(final Member manager, final Organization organization) {
-			return new League(manager, organization, name, startAt, endAt, Round.from(maxRound));
-=======
 		public League toEntity(final Member manager) {
 			return new League(manager, manager.getOrganization(), name, startAt, endAt, Round.from(maxRound));
->>>>>>> Stashed changes
 		}
 	}