#20 merge S3

Drink-Easy · Aug 12, 2024 · 3d9b289 · 3d9b289
1 parent bd87fdc
commit 3d9b289
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/src/main/java/com/drinkeg/drinkeg/jwt/JWTFilter.java b/src/main/java/com/drinkeg/drinkeg/jwt/JWTFilter.java
@@ -1,13 +1,8 @@
 package com.drinkeg.drinkeg.jwt;
 
-<<<<<<< HEAD
+
 import com.drinkeg.drinkeg.dto.loginDTO.jwtDTO.PrincipalDetail;
 import com.drinkeg.drinkeg.dto.loginDTO.oauth2DTO.UserDTO;
-=======
-import com.drinkeg.drinkeg.apipayLoad.code.status.ErrorStatus;
-import com.drinkeg.drinkeg.dto.securityDTO.jwtDTO.PrincipalDetail;
-import com.drinkeg.drinkeg.dto.securityDTO.oauth2DTO.UserDTO;
->>>>>>> feature/s3
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.Cookie;