From 3d9b2897a98948abc2ee47c11581df0ae694ed20 Mon Sep 17 00:00:00 2001
From: dayeong <dayeongyun184@gmail.com>
Date: Mon, 12 Aug 2024 22:38:34 +0900
Subject: [PATCH] #20 merge S3

---
 src/main/java/com/drinkeg/drinkeg/jwt/JWTFilter.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/main/java/com/drinkeg/drinkeg/jwt/JWTFilter.java b/src/main/java/com/drinkeg/drinkeg/jwt/JWTFilter.java
index 90aaeb94..169ccb6c 100644
--- 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;