From db70f94ce2578618c7c2f8ac0c38c1c4f2b6540f Mon Sep 17 00:00:00 2001
From: zhai_lw <zhai_lw@outlook.com>
Date: Wed, 16 Jan 2019 10:34:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/wmj'

# Conflicts:
#	GDMS.iml
---
 .idea/artifacts/gdms_Web_exploded.xml | 2 +-
 .idea/modules.xml                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.idea/artifacts/gdms_Web_exploded.xml b/.idea/artifacts/gdms_Web_exploded.xml
index 5e02dde..670580d 100644
--- a/.idea/artifacts/gdms_Web_exploded.xml
+++ b/.idea/artifacts/gdms_Web_exploded.xml
@@ -2,7 +2,7 @@
   <artifact type="exploded-war" name="gdms:Web exploded">
     <output-path>$PROJECT_DIR$/out/artifacts/gdms_Web_exploded</output-path>
     <root id="root">
-      <element id="javaee-facet-resources" facet="gdms/web/Web" />
+      <element id="javaee-facet-resources" facet="GDMS/web/Web" />
       <element id="directory" name="WEB-INF">
         <element id="directory" name="classes">
           <element id="module-output" name="gdms" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 9f494a5..f353925 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/gdms.iml" filepath="$PROJECT_DIR$/gdms.iml" />
+      <module fileurl="file://$PROJECT_DIR$/GDMS.iml" filepath="$PROJECT_DIR$/GDMS.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file