From 1bceb8698add49d1e7ed215b4a46a0c46d8ee751 Mon Sep 17 00:00:00 2001
From: tolag3 <tolag3@gmail.com>
Date: Thu, 5 Sep 2024 10:55:44 +0900
Subject: [PATCH] =?UTF-8?q?=EC=84=9C=EB=B8=94=EB=A6=BF=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../egovframework/springmvc/egov-com-servlet.xml   |  1 -
 .../webapp/WEB-INF/jsp/layout/seedAdminLayout.jsp  | 14 ++++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/WEB-INF/config/egovframework/springmvc/egov-com-servlet.xml b/src/main/webapp/WEB-INF/config/egovframework/springmvc/egov-com-servlet.xml
index 6952fae0..51e081cf 100644
--- a/src/main/webapp/WEB-INF/config/egovframework/springmvc/egov-com-servlet.xml
+++ b/src/main/webapp/WEB-INF/config/egovframework/springmvc/egov-com-servlet.xml
@@ -89,7 +89,6 @@
 	<mvc:resources mapping="/site/**" location="/WEB-INF/views/site/" />
 	<mvc:resources mapping="/css/**" location="/WEB-INF/views/_common/_css/" />
 	<mvc:resources mapping="/js/**" location="/WEB-INF/views/_common/_js/" />
-	<mvc:resources mapping="/img/**" location="/WEB-INF/views/_common/_images/" />
 	<mvc:resources mapping="/ico/**" location="/WEB-INF/views/_common/_ico/" />
 	<mvc:resources mapping="/font/**" location="/WEB-INF/views/_common/_font/" />
 	<mvc:resources mapping="/ark/**" location="/WEB-INF/views/_common/_ark/" />
diff --git a/src/main/webapp/WEB-INF/jsp/layout/seedAdminLayout.jsp b/src/main/webapp/WEB-INF/jsp/layout/seedAdminLayout.jsp
index 7c02a0b4..d17c24ef 100644
--- a/src/main/webapp/WEB-INF/jsp/layout/seedAdminLayout.jsp
+++ b/src/main/webapp/WEB-INF/jsp/layout/seedAdminLayout.jsp
@@ -71,8 +71,8 @@
 		<!-- js -->
 		<!-- 필요한 js 추후 추가 예정 -->
 		<!-- 라이브러리, 플러그인 -->
-		<script src="/js/seed/lib/jquery.blockUI.js"></script>
-		<script src="/js/seed/lib/jquery-ui.min.js"></script>
+		<script src="/js/lib/jquery.blockUI.js"></script>
+		<script src="/js/lib/jquery-ui.min.js"></script>
 		<!-- <script src="/js/lib/jquery-1.9.1.min.js"></script>
 		
 		
@@ -90,17 +90,11 @@
 		<script src="/js/smartPop.js"></script>
 		<script src="/js/seed.common.js"></script>
 		<script src="/js/seed.tab.js"></script> -->
-<<<<<<< HEAD
-		<script src="/js/seed/seed.app.js"></script>
-		<script src="/js/seed/lib/jquery.bxslider.min.js"></script>
-		<script src="/js/seed/commonFileUtil.js"></script>
-		<script src="/js/seed/common_XHR.js"></script>
-		<script src="/js/seed/jquery.selectboxes.js"></script>
-=======
 		<script src="/js/seed.app.js"></script>
 		<script src="/js/lib/jquery.bxslider.min.js"></script>
 		<script src="/js/commonFileUtil.js"></script>
->>>>>>> refs/heads/tolag3
+		<script src="/js/common_XHR.js"></script>
+		<script src="/js/jquery.selectboxes.js"></script>
 		<!-- <script src="/js/jquery.form.js"></script>
 		
 		<script src="/js/common.js"></script>