서블릿 수정
This commit is contained in:
parent
d2c5879948
commit
1bceb8698a
@ -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/" />
|
||||
|
||||
@ -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>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user