From 6a72a3edec87cca9996c7ab3be3fd48479881945 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 21:55:28 +0900
Subject: [PATCH] 충돌 수정

---
 src/main/webapp/i18n/ko/global.json |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index 6d14c69..43be140 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -875,7 +875,8 @@
         "successToApiIssueDefault" : "湲곕낯媛� �꽕�젙 �셿猷�",
         "failedToApiIssueDefault" : "湲곕낯媛� �꽕�젙 �떎�뙣",
         "successToApiIssueOverlap" : "以묐났媛� �꽕�젙 �셿猷�",
-        "failedToApiIssueOverlap" : "以묐났媛� �꽕�젙 �떎�뙣"
+        "failedToApiIssueOverlap" : "以묐났媛� �꽕�젙 �떎�뙣",
+        "failedToApiMonitor": "API 湲곕줉 議고쉶 �떎�뙣"
     },
     "companyField" : {
         "info": "�뾽泥댁젙蹂�",

--
Gitblit v1.8.0