From 85d0116474352f8c58df8a814ff9b3129b638d69 Mon Sep 17 00:00:00 2001
From: xiangwbs <xiwnagwbs@163.com>
Date: Thu, 28 Dec 2017 19:11:43 +0800
Subject: [PATCH] merge

---
 .gitignore | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 093b7a7..87b39d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,10 +7,9 @@ logs
 */target
 */*.iml
 
-
 mvnw
 mvnw.cmd
 ### eclipse ###
-sbdemo/.project
-sbdemo/.classpath
-sbdemo/.settings
+*/.project
+*/.classpath
+*/.settings