From b8e86e2b44b796ced6f8fa557dfee532749dcc6c Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Wed, 15 Nov 2017 17:25:02 +0800
Subject: [PATCH] Merge branch 'master' of http://fengxiang@blit.7drlb.com:8888/r/task.git

---
 .idea/artifacts/task_war.xml |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.idea/artifacts/task_war.xml b/.idea/artifacts/task_war.xml
index 2874d55..141173b 100644
--- a/.idea/artifacts/task_war.xml
+++ b/.idea/artifacts/task_war.xml
@@ -1,8 +1,8 @@
-<component name="ArtifactManager">
-  <artifact type="war" name="task:war">
-    <output-path>$PROJECT_DIR$/target</output-path>
-    <root id="archive" name="monitor.war">
-      <element id="artifact" artifact-name="task:war exploded" />
-    </root>
-  </artifact>
+<component name="ArtifactManager">
+  <artifact type="war" name="task:war">
+    <output-path>$PROJECT_DIR$/target</output-path>
+    <root id="archive" name="task.war">
+      <element id="artifact" artifact-name="task:war exploded" />
+    </root>
+  </artifact>
 </component>
\ No newline at end of file

--
Gitblit v1.8.0