From 35ff13fb38c912d3896499bc39a047faac919918 Mon Sep 17 00:00:00 2001
From: leedj312 <dlehd467@gmail.com>
Date: Tue, 15 Jul 2025 20:27:43 +0900
Subject: [PATCH] =?UTF-8?q?=ED=97=A4=EB=93=9C=EB=A6=AC=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95=20=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruseFcltMng/fcltReg/pbnstReg/headList.tsx | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx
index 83d7a47fe..35e2a9d60 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx
@@ -109,7 +109,6 @@ export const concentratedWaterInfo: formDetailType[] = [
 ];
 
 export const ruseFcltinfo: formDetailType[] = [
-<<<<<<< HEAD
   { id: "rprcsFcltCpct", lable: "시설용량(m³/일)", type: "number", maxLenght:numSize },
   { id: "majorPrcsMsrcCd", lable: "주처리공법", maxLenght:txtSize },
   { id: "addr", lable: "위치(주소)", maxLenght:txtSize},
@@ -127,14 +126,6 @@ export const ruseFcltinfo: formDetailType[] = [
     selectData: "yn",
   }, // 머가 내? 외?,
   { id: "mainSplyPumpCpct", lable: "메인공급펌프 용량", type: "number" , maxLenght:numSize},
-=======
-  { id: "rprcsFcltCpct", lable: "시설용량(m³/일)", type: "number" },
-  { id: "majorPrcsMsrcCd", lable: "주처리공법" },
-  { id: "addr", lable: "위치(주소)" },
-  { id: "rprcsMthdCd", lable: "재처리방식", type: "select", selectData: "rusePrcsMthdCd" },
-  { id: "inoutYn", lable: "위치(처리장 내외)"  ,type: "select" , selectData: "yn"}, // 머가 내? 외?,
-  { id: "mainSplyPumpCpct", lable: "메인공급펌프 용량(m³/일)", type: "number" },
->>>>>>> a92f567e5c624486d80984c5e4427543aafdfdde
 ];
 
 export const businessMoneyInfo: formDetailType[] = [
@@ -159,7 +150,6 @@ export const businessSttnInfo: formDetailType[] = [
 
 
 export const ruseWaterQulityList: formDetailType[] = [
-<<<<<<< HEAD
   { id: "bod", lable: "BOD(mg/L)", type: "text", maxLenght:numSize },
   { id: "grssClfg", lable: "총대장균군수(개/mg)", type: "text" , maxLenght:numSize},
   { id: "combResdch", lable: "결합잔류염소(mh/L)", type: "text" , maxLenght:numSize},
@@ -171,17 +161,4 @@ export const ruseWaterQulityList: formDetailType[] = [
   { id: "ph", lable: "수소이온농도", type: "text", maxLenght:numSize},
   { id: "clIonQnt", lable: "염화물(mg/L)", type: "text", maxLenght:numSize },
   { id: "cdtnv", lable: "전기전도도(μs/cm)​", type: "text", maxLenght:numSize },
-=======
-  { id: "bod", lable: "BOD(mg/L)", type: "text" },
-  { id: "grssClfg", lable: "총대장균군수(개/mg)", type: "text" },
-  { id: "combResdch", lable: "결합잔류염소(mh/L)", type: "text" },
-  { id: "trbt", lable: "탁도(NTU)", type: "text" },
-  { id: "smll", lable: "냄새", type: "text" },
-  { id: "crmty", lable: "색도(도)", type: "text" },
-  { id: "tn", lable: "총질소(T-N)(mg/L)", type: "text" },
-  { id: "tph", lable: "총인(T-P)(mg/L)", type: "text" },
-  { id: "ph", lable: "수소이온농도(PH)", type: "text" },
-  { id: "clIonQnt", lable: "염화물(mg/L)", type: "text" },
-  { id: "cdtnv", lable: "전기전도도(μs/cm)​", type: "text" },
->>>>>>> a92f567e5c624486d80984c5e4427543aafdfdde
 ];