CLAP-172 Feat: merge conflict slove

joowojr · joowojr · commit 0a8fc37fccc5 · 2025-01-30T18:39:53.000+07:00
<footer> - 관련: #164
diff --git a/src/main/java/clap/server/domain/model/member/Member.java b/src/main/java/clap/server/domain/model/member/Member.java
@@ -74,6 +74,8 @@ public void updateMemberInfo(String name, Boolean agitNotificationEnabled, Boole
         if (imageUrl != null) {
             this.imageUrl = imageUrl;
         }
+    }
+
     public void setStatusDeleted() {
         this.status = MemberStatus.DELETED;
     }

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,8 @@ public void updateMemberInfo(String name, Boolean agitNotificationEnabled, Boole`
`74`	`74`	`if (imageUrl != null) {`
`75`	`75`	`this.imageUrl = imageUrl;`
`76`	`76`	`}`
	`77`	`+ }`
	`78`	`+`
`77`	`79`	`public void setStatusDeleted() {`
`78`	`80`	`this.status = MemberStatus.DELETED;`
`79`	`81`	`}`