home.jsp合并冲突,动态页面相关代码已注掉
This commit is contained in:
@@ -10,11 +10,6 @@
|
|||||||
<title>${fns:getStringProperty('productName','NIS')}</title>
|
<title>${fns:getStringProperty('productName','NIS')}</title>
|
||||||
|
|
||||||
<script src="${pageContext.request.contextPath}/static/pages/scripts/home.js" type="text/javascript"></script>
|
<script src="${pageContext.request.contextPath}/static/pages/scripts/home.js" type="text/javascript"></script>
|
||||||
<style type="text/css">
|
|
||||||
#mainFrame:-webkit-full-screen {
|
|
||||||
/*background-color:rgb(255, 255, 12);*/
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
|
|||||||
Reference in New Issue
Block a user