home.jsp合并冲突，动态页面相关代码已注掉

src/main/webapp/WEB-INF/views/home.jsp

@@ -10,11 +10,6 @@
 <title>${fns:getStringProperty('productName','NIS')}</title>
 
 <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">
 	$(document).ready(function() {