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/views/ispField/ispFieldModify.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/views/ispField/ispFieldModify.html b/src/main/webapp/views/ispField/ispFieldModify.html
index 94aed34..5c01252 100644
--- a/src/main/webapp/views/ispField/ispFieldModify.html
+++ b/src/main/webapp/views/ispField/ispFieldModify.html
@@ -106,7 +106,7 @@
             <div>
                 <div class="form-group">
                     <label for="hostingFieldModifyForm8" class="issue-label">
-                        <span translate="hostingField.desc">鍮꾧퀬</span>
+                        <span translate="hostingField.memo">鍮꾧퀬</span>
                     </label>
                     <input id="hostingFieldModifyForm8"
                            name="memo"

--
Gitblit v1.8.0