Merge branch 'develop' 2178f98

f-lab-edu · Apr 21, 2021 · 665666b · 665666b
1 parent 3e35eea
commit 665666b
Showing 1 changed file with 1 addition and 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
@@ -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