From 05c57cf74f75fdbeca32178b9c7f93395062d0a1 Mon Sep 17 00:00:00 2001
From: JSYOO <JSYOO@DESKTOP-U1IONCV>
Date: Fri, 1 Oct 2021 15:49:01 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B9=83=20=EC=B6=A9=EB=8F=8C=EC=A4=91=20?=
 =?UTF-8?q?=EC=86=8C=EC=8A=A4=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/js/nlib.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/webapp/js/nlib.js b/src/main/webapp/js/nlib.js
index 8bfd3072..e5602316 100644
--- a/src/main/webapp/js/nlib.js
+++ b/src/main/webapp/js/nlib.js
@@ -150,7 +150,6 @@ function fn_lengthBytes(s) {
 
 function fn_extractContentText(html) {
     return new DOMParser().parseFromString(html, "text/html").documentElement.textContent;
-<<<<<<< HEAD
 }
 
 function risShow(risId){
@@ -223,6 +222,4 @@ function insertInterest(masterId){
     }).done(function(result){
     	alert(result);
     });
-=======
->>>>>>> refs/remotes/origin/master
 }
\ No newline at end of file