From 9f03f3dabea0afe931db503d2901f67feb4e7da1 Mon Sep 17 00:00:00 2001
From: Rinjae <dearmai@dearmai.net>
Date: Fri, 5 Dec 2025 18:17:20 +0900
Subject: [PATCH] =?UTF-8?q?push=202=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/eactive/eai/common/logger/EAILogDAO.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/main/java/com/eactive/eai/common/logger/EAILogDAO.java b/src/main/java/com/eactive/eai/common/logger/EAILogDAO.java
index 3a48e5d..08cc9b3 100644
--- a/src/main/java/com/eactive/eai/common/logger/EAILogDAO.java
+++ b/src/main/java/com/eactive/eai/common/logger/EAILogDAO.java
@@ -60,11 +60,6 @@ import com.ext.eai.common.stdmessage.STDMessageKeys;
 // safeDB
 import com.eactive.ext.kjb.safedb.KjbSafedbWrapper;
 import com.eactive.ext.kjb.safedb.Utils;
-<<<<<<<<< Temporary merge branch 1
-// until here
-=========
-// until here 
->>>>>>>>> Temporary merge branch 2
 
 
 @Service