From 665666bce8fd8399e160f7178a59308243f526a3 Mon Sep 17 00:00:00 2001
From: "jungkh405@naver.com" <jungkh405@naver.com>
Date: Wed, 21 Apr 2021 23:47:47 +0900
Subject: [PATCH] Merge branch 'develop' 2178f98
---
.../java/com/flab/shoeauction/domain/users/user/User.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/main/java/com/flab/shoeauction/domain/users/user/User.java b/src/main/java/com/flab/shoeauction/domain/users/user/User.java
index 2e34fd6a..16c876c2 100644
--- a/src/main/java/com/flab/shoeauction/domain/users/user/User.java
+++ b/src/main/java/com/flab/shoeauction/domain/users/user/User.java
@@ -184,15 +184,12 @@ public Address findAddress(Long addressId) {
return addressBook.findAddress(addressId);
}
-<<<<<<< HEAD
public void chargingPoint(Long chargeAmount) {
this.point += chargeAmount;
}
-}
-=======
+
public boolean isCurrentEmail(String email) {
return this.email.equals(email);
}
}
->>>>>>> 88a31152e2060a2447223634e16d215274d4ffa4