Fix: conflict 제거

Team-NumberOne · Nov 11, 2023 · 14add03 · 14add03
1 parent 1e2e2a3
commit 14add03
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/main/java/com/numberone/backend/domain/disaster/service/DisasterDataCollector.java b/src/main/java/com/numberone/backend/domain/disaster/service/DisasterDataCollector.java
@@ -39,7 +39,6 @@
 @Component
 @RequiredArgsConstructor
 @Slf4j
-@Transactional(readOnly = true)
 public class DisasterDataCollector {
     private final RestTemplate restTemplate;
     private final DisasterProperties disasterProperties;
@@ -60,10 +59,6 @@ public void init() {
     }
 
     @Scheduled(fixedDelay = 60 * 1000)
-<<<<<<< HEAD
-=======
-    @Transactional
->>>>>>> feat/sponsor
     public void collectData() {
         //log.info("collectData()");
         URI uri = UriComponentsBuilder