chore: build.gradle 수정

LikeLion-12th-SKHU · Jul 29, 2024 · 00a741c · 00a741c
1 parent 6740a35
commit 00a741c
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -36,19 +36,16 @@ dependencies {
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.security:spring-security-test'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-<<<<<<< HEAD
 
     implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
     runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
     runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
-=======
     // jwt
     implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
     runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
     runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
     //aws
     implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
->>>>>>> d97bc452c9da72e8ea20b5bb705e571f4bdf856d
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
 }