From d6c809d4702af7bbd3c1cf2b33b19c8a1d4055b5 Mon Sep 17 00:00:00 2001
From: yuhalog <youha0930@gmail.com>
Date: Tue, 17 Jun 2025 10:55:01 +0900
Subject: [PATCH] fix: merge fix

---
 .../ai-recommend/src/main/resources/application.yml           | 3 ---
 smarketing-java/build.gradle                                  | 4 +---
 .../java/com/won/smarketing/store/dto/MenuUpdateRequest.java  | 4 +---
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/smarketing-java/ai-recommend/src/main/resources/application.yml b/smarketing-java/ai-recommend/src/main/resources/application.yml
index 985f4a3..ee94915 100644
--- a/smarketing-java/ai-recommend/src/main/resources/application.yml
+++ b/smarketing-java/ai-recommend/src/main/resources/application.yml
@@ -33,15 +33,12 @@ external:
     api-key: ${PYTHON_AI_API_KEY:dummy-key}
     timeout: ${PYTHON_AI_TIMEOUT:30000}
 
-<<<<<<< HEAD
 azure:
   eventhub:
     namespace: ${AZURE_EVENTHUB_NAMESPACE}
     marketing-tip-hub: ${AZURE_EVENTHUB_MARKETING_TIP_HUB:marketing-tip-requests}
     consumer-group: ${AZURE_EVENTHUB_CONSUMER_GROUP:ai-recommend-service}
 
-=======
->>>>>>> origin/main
 management:
   endpoints:
     web:
diff --git a/smarketing-java/build.gradle b/smarketing-java/build.gradle
index fefa680..d0a82d4 100644
--- a/smarketing-java/build.gradle
+++ b/smarketing-java/build.gradle
@@ -47,13 +47,11 @@ subprojects {
 
         testImplementation 'org.springframework.boot:spring-boot-starter-test'
         testImplementation 'org.springframework.security:spring-security-test'
-<<<<<<< HEAD
 
         implementation 'com.azure:azure-messaging-eventhubs:5.18.0'
         implementation 'com.azure:azure-messaging-eventhubs-checkpointstore-blob:1.19.0'
         implementation 'com.azure:azure-identity:1.11.4'
-=======
->>>>>>> origin/main
+
     }
 
     tasks.named('test') {
diff --git a/smarketing-java/store/src/main/java/com/won/smarketing/store/dto/MenuUpdateRequest.java b/smarketing-java/store/src/main/java/com/won/smarketing/store/dto/MenuUpdateRequest.java
index c5ed581..e94097e 100644
--- a/smarketing-java/store/src/main/java/com/won/smarketing/store/dto/MenuUpdateRequest.java
+++ b/smarketing-java/store/src/main/java/com/won/smarketing/store/dto/MenuUpdateRequest.java
@@ -35,11 +35,9 @@ public class MenuUpdateRequest {
 
     @Schema(description = "메뉴 설명", example = "진한 원두의 깊은 맛")
     private String description;
-<<<<<<< HEAD
 
     @Schema(description = "이미지")
     @Size(max = 500, message = "이미지 URL은 500자 이하여야 합니다")
     private MultipartFile image;
-=======
->>>>>>> origin/main
+
 }