fix: git conflit err

9oormthon-univ · Mar 23, 2024 · 82a2953 · 82a2953
1 parent f4e9861
commit 82a2953
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/CONFIG b/CONFIG
diff --git a/src/main/kotlin/com/vacgom/backend/member/exception/HealthConditionError.kt b/src/main/kotlin/com/vacgom/backend/member/exception/HealthConditionError.kt
@@ -4,9 +4,10 @@ import com.vacgom.backend.global.exception.error.ErrorCode
 import org.springframework.http.HttpStatus
 
 enum class HealthConditionError(
-        override val message: String,
-        override val status: HttpStatus,
-        override val code: String,
+    override val message: String,
+    override val status: HttpStatus,
+    override val code: String,
 ) : ErrorCode {
     INVALID_HEALTH_CONDITION("올바르지 않은 Health Condition입니다.", HttpStatus.BAD_REQUEST, "HC_001"),
 }
+
diff --git a/src/main/kotlin/com/vacgom/backend/member/exception/MemberError.kt b/src/main/kotlin/com/vacgom/backend/member/exception/MemberError.kt
@@ -3,7 +3,6 @@ package com.vacgom.backend.member.exception
 import com.vacgom.backend.global.exception.error.ErrorCode
 import org.springframework.http.HttpStatus
 
-
 enum class MemberError(
         override val message: String,
         override val status: HttpStatus,

diff --git a/src/main/kotlin/com/vacgom/backend/member/presentation/MeController.kt b/src/main/kotlin/com/vacgom/backend/member/presentation/MeController.kt
@@ -3,6 +3,7 @@ package com.vacgom.backend.member.presentation
 import com.vacgom.backend.auth.application.dto.response.MeResponse
 import com.vacgom.backend.disease.domain.constants.HealthCondition
 import com.vacgom.backend.global.exception.error.BusinessException
+import com.vacgom.backend.global.exception.error.GlobalError
 import com.vacgom.backend.global.security.annotation.AuthId
 import com.vacgom.backend.member.application.MemberService
 import com.vacgom.backend.member.application.dto.request.UpdateHealthConditionRequest