去除冲突标记

src/main/webapp/WEB-INF/include/excel/importModal.jsp

@@ -2,7 +2,6 @@
 <%@ include file="/WEB-INF/include/taglib.jsp"%> 
 <script src="${pageContext.request.contextPath}/static/pages/scripts/importExcel.js" type="text/javascript"></script>
 <div class="modal fade" id="import_modal" tabindex="-1" role="dialog" aria-labelledby="mo" aria-hidden="true">
-<<<<<<< HEAD
 	<form id="importForm1" action="${ctx}/ntc/iplist/import?importPath=${importPath}" method="post" enctype="multipart/form-data" class="form-horizontal"
 		onsubmit="loading('<spring:message code='loading'/>');">
 		

src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp

@@ -536,8 +536,7 @@
 				</div>
 			</div>
 </div>
-<c:set var="importPath" value="/proxy/intercept/${fn:toLowerCase(interceptType)}/list"/>
-<c:set var="functionId" value="${cfg.functionId}"/>
+<c:set var="importPath" value="/proxy/intercept/${fn:toLowerCase(interceptType)}/list?functionId=${cfg.functionId}"/>
 <!-- 模板导入，start -->
 	 <%@include file="/WEB-INF/include/excel/importModal.jsp" %>
 </body>

src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp

@@ -471,7 +471,6 @@
 				</div>
 			</div>
 </div>
-<<<<<<< HEAD
 <c:set var="importPath" value="/ntc/iplist/list?functionId=${cfg.functionId}"/>
 <!-- 模板导入，start -->
 <%@include file="/WEB-INF/include/excel/importModal.jsp" %>