From 1cc9251497d1b094f1c0b0b7d935db08ed9a0fb6 Mon Sep 17 00:00:00 2001 From: sungone <20200999@sungshin.ac.kr> Date: Mon, 17 Apr 2023 19:20:21 +0900 Subject: [PATCH] #3 fix : merge conflict --- .../java/com/zatch/zatchserver/controller/UserController.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/com/zatch/zatchserver/controller/UserController.java b/src/main/java/com/zatch/zatchserver/controller/UserController.java index 8973072..fec695e 100644 --- a/src/main/java/com/zatch/zatchserver/controller/UserController.java +++ b/src/main/java/com/zatch/zatchserver/controller/UserController.java @@ -13,9 +13,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile;