From f5eea82dd38bd54a2e067a27cfc33b48bf32bdc5 Mon Sep 17 00:00:00 2001
From: leebj <leebj91@xit.co.kr>
Date: Fri, 28 Jun 2024 09:41:36 +0900
Subject: [PATCH] =?UTF-8?q?=EC=BB=A4=EB=B0=8B=20=EC=B6=A9=EB=8F=8C?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/sql/mapper/base/file-mapper.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/main/resources/sql/mapper/base/file-mapper.xml b/src/main/resources/sql/mapper/base/file-mapper.xml
index f44e5572..485974dd 100644
--- a/src/main/resources/sql/mapper/base/file-mapper.xml
+++ b/src/main/resources/sql/mapper/base/file-mapper.xml
@@ -102,16 +102,9 @@ SELECT NEW_ID
      , CONCAT(DIR, NEW_ID, '.', #{file.extension}) PATH
   FROM (
        SELECT NVL(MAX(FILE_ID) + 1, CONCAT(THIS_DAY, '00001')) NEW_ID
-<<<<<<< HEAD
          FROM (<include refid="utility.selectThisDay" />) B LEFT OUTER JOIN
               TB_FILE A ON FILE_ID LIKE CONCAT(THIS_DAY, '%')
        ) T1, (
-=======
-         FROM (<include refid="utility.selectThisDay" />) B 
-         LEFT OUTER JOIN TB_FILE A ON FILE_ID LIKE CONCAT(THIS_DAY, '%')
-       ) T1
-     , (
->>>>>>> branch 'main' of http://xit.xit-git.com:3000/xit-app/fims.git
        <include refid="fileDirs" />
         WHERE INF_TYPE = #{file.infoType}
        ) T2