From d71194659b907c11e2acdb7c78c1fac4d21d7c8b Mon Sep 17 00:00:00 2001 From: k-oshita Date: Fri, 18 Sep 2026 11:02:42 +0900 Subject: [PATCH] =?UTF-8?q?[FIX]=E3=82=B4=E3=83=BC=E3=83=AB=E3=83=A2?= =?UTF-8?q?=E3=83=87=E3=83=AB=E3=81=AE=E3=83=90=E3=82=B0=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/app/domain/model/GoalModel.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/com/example/demo/app/domain/model/GoalModel.java b/src/main/java/com/example/demo/app/domain/model/GoalModel.java index 52b3ad7..94a57d2 100644 --- a/src/main/java/com/example/demo/app/domain/model/GoalModel.java +++ b/src/main/java/com/example/demo/app/domain/model/GoalModel.java @@ -2,12 +2,9 @@ package com.example.demo.app.domain.model; import java.time.LocalDate; -<<<<<<< HEAD import com.example.demo.app.infra.entity.GoalEntity; import com.example.demo.app.presentation.form.GoalForm; -======= ->>>>>>> f955667682040961a972b0107053018dccd41543 import lombok.AllArgsConstructor; import lombok.Getter; @@ -27,7 +24,6 @@ public class GoalModel { private Integer goalComplete; -<<<<<<< HEAD public static GoalModel convertFrom(GoalEntity goalEntity) { return new GoalModel( goalEntity.getGoalId(), @@ -59,6 +55,4 @@ public class GoalModel { goalForm.getGoalComplete()); } -======= ->>>>>>> f955667682040961a972b0107053018dccd41543 } \ No newline at end of file