From 2b49d3f7c4d6a55347b5ff9731b7a548618549c9 Mon Sep 17 00:00:00 2001
From: zhangrui <zhangrui@lymsh.com>
Date: Thu, 8 Sep 2016 18:17:17 +0800
Subject: [PATCH] Merge branch 'master' of D:\Code\regional-platform with
 conflicts.

---
 platform-operate-api/src/main/webapp/WEB-INF/web.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform-operate-api/src/main/webapp/WEB-INF/web.xml b/platform-operate-api/src/main/webapp/WEB-INF/web.xml
index d834bfa..04eaf4d 100644
--- a/platform-operate-api/src/main/webapp/WEB-INF/web.xml
+++ b/platform-operate-api/src/main/webapp/WEB-INF/web.xml
@@ -13,7 +13,7 @@
 		 version="2.5"
 		 xsi:schemaLocation="http://java.sun.com/xml/ns/javaee           http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
 
-	<!--
+
     <filter>
       <filter-name>CorsFilter</filter-name>
       <filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
@@ -47,7 +47,7 @@
       <url-pattern>/*</url-pattern>
     </filter-mapping>
 
-     -->
+
 	<servlet-mapping>
 		<servlet-name>default</servlet-name>
 		<url-pattern>*.xml</url-pattern>
-- 
1.8.3.1