From 2f928181d1bd93c7eaa7c3d15bfc9eb8e4be0686 Mon Sep 17 00:00:00 2001
From: roo00 <zhouruicn@outlook.com>
Date: Sat, 22 Dec 2018 21:37:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B5=84=E6=BA=90=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore          | 4 +---
 o2server/.gitignore | 3 ++-
 o2server/pom.xml    | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 44db12e7b6..247fbc63a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-.DS_Store
-jvm/*
-webserver/x_desktop_web/.idea/*
\ No newline at end of file
+/o2cloud/
\ No newline at end of file
diff --git a/o2server/.gitignore b/o2server/.gitignore
index f3de6a4d74..ab0c408ce9 100644
--- a/o2server/.gitignore
+++ b/o2server/.gitignore
@@ -1,3 +1,4 @@
 .project
 /local/
-/logs/
\ No newline at end of file
+/logs/
+/x_build_and_scratch/
\ No newline at end of file
diff --git a/o2server/pom.xml b/o2server/pom.xml
index 25901f097c..0ac97b77f2 100644
--- a/o2server/pom.xml
+++ b/o2server/pom.xml
@@ -62,7 +62,6 @@
 		<module>x_report_assemble_control</module>
 		<module>x_strategydeploy_assemble_control</module>
 		<module>x_program_center</module>
-		<module>x_build_and_scratch</module>
 		<module>x_console</module>
 	</modules>
 	<properties>
-- 
GitLab