221110-1

src/main/webapp/js/app/locales/locale-ko.js

@@ -168,26 +168,8 @@ const ITP_MSG_LOCALE = (function() {
 			"itemClassLevel4": "품목분류Level 4",
 			"prnSeq": "출력순번",
 			"writeYn": "쓰기여부",
-<<<<<<< HEAD
-			"pchReqQty": "요청수량",
-			"pchReqAmt": "요청금액",
-			"unitGubun": "단가구분",
-			"pchPodrUnqNo": "발주번호",
-			"pchOdrStCd": "발주상태코드",
-			"pchOdrStNm": "발주상태명",
-			"podrDt": "발주일자",
-			"dlvReqDt": "납품요철일",
-			"whsNm": "납품장소",
-			"podrTotalAmt": "총 발주금액",
-			"podrItemQty": "발주품목수",
-			"podrMgrNm": "발주담당자",
-			"pchPodrDtlNo": "항번",
-			"podrQty": "발주수량",
-			"podrAmt": "발주금액"
-=======
 			"pchReqQty":"요청수량",
 			"pchReqAmt":"요청금액"
->>>>>>> 234216be7a232a9d2bf4dea5563cc7fe7d420d46
 		},
 		"table": {
 			"brandId": "브랜드ID",