From f7bcc975c5965b7e1a11a61936ac7ebda8b2ccc1 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Thu, 5 Sep 2024 12:31:48 +0900
Subject: [PATCH] =?UTF-8?q?2024-09-05=2012:31=20=EA=B3=B5=ED=86=B5=20js=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/jsp/layout/seedAdminLayout.jsp     | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/layout/seedAdminLayout.jsp b/src/main/webapp/WEB-INF/jsp/layout/seedAdminLayout.jsp
index 7c02a0b4..9a69f435 100644
--- a/src/main/webapp/WEB-INF/jsp/layout/seedAdminLayout.jsp
+++ b/src/main/webapp/WEB-INF/jsp/layout/seedAdminLayout.jsp
@@ -90,17 +90,12 @@
 		<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>