From f9424f6ac889fba6876af0aabe7e82f66f513086 Mon Sep 17 00:00:00 2001
From: swcho <swcho@mind-one.co.kr>
Date: Wed, 13 Aug 2025 15:45:06 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20merge=20=EB=B0=98=EC=98=81=20=EC=95=88?=
 =?UTF-8?q?=EB=90=9C=20=EC=82=AC=ED=95=AD=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/ui/map/searchBar/procSearchBar.tsx                    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/common/business_components/src/ui/map/searchBar/procSearchBar.tsx b/packages/common/business_components/src/ui/map/searchBar/procSearchBar.tsx
index 6fb2d9890..465471715 100644
--- a/packages/common/business_components/src/ui/map/searchBar/procSearchBar.tsx
+++ b/packages/common/business_components/src/ui/map/searchBar/procSearchBar.tsx
@@ -48,9 +48,6 @@ export const ProcSearchBar = ({ gisMaps, facilityTypes }: SearchBarProps) => {
         text: f.properties.mctpv_korn_nm,
         val: f.properties.mctpv_cd,
       }))
-<<<<<<< HEAD
-      .sort((a, b) => a.text.localeCompare(b.text, 'ko'));
-=======
       .sort((a, b) => {
         // 커스텀 순서 정의
         const customOrder = [
@@ -88,7 +85,6 @@ export const ProcSearchBar = ({ gisMaps, facilityTypes }: SearchBarProps) => {
         // 둘 다 커스텀 순서에 없으면 기본 알파벳 순서
         return a.text.localeCompare(b.text, 'ko');
       });
->>>>>>> iipbs/common/main
     setSidoData([{ text: "시도", val: "0" }, ...list]);
   };