tolag3/fairnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of

Browse Source 
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

Conflicts:
	src/main/webapp/WEB-INF/jsp/layout/seedAdminLayout.jsp
This commit is contained in:
myname 2024-09-05 12:34:14 +09:00
commit cebb390149
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/webapp/WEB-INF/jsp/layout/seedAdminLayout.jsp
View File

@ -71,8 +71,8 @@
<!-- js --> <!-- js -->
<!-- 필요한 js 추후 추가 예정 --> <!-- 필요한 js 추후 추가 예정 -->
<!-- 라이브러리, 플러그인 --> <!-- 라이브러리, 플러그인 -->
<script src="/js/seed/lib/jquery.blockUI.js"></script> <script src="/js/lib/jquery.blockUI.js"></script>
<script src="/js/seed/lib/jquery-ui.min.js"></script> <script src="/js/lib/jquery-ui.min.js"></script>
<!-- <script src="/js/lib/jquery-1.9.1.min.js"></script> <!-- <script src="/js/lib/jquery-1.9.1.min.js"></script>
@ -95,7 +95,6 @@
<script src="/js/commonFileUtil.js"></script> <script src="/js/commonFileUtil.js"></script>
<script src="/js/common_XHR.js"></script> <script src="/js/common_XHR.js"></script>
<script src="/js/jquery.selectboxes.js"></script> <script src="/js/jquery.selectboxes.js"></script>
<!-- <script src="/js/jquery.form.js"></script> <!-- <script src="/js/jquery.form.js"></script>
<script src="/js/common.js"></script> <script src="/js/common.js"></script>