From 38b70463e769cee1c9a2c513ca41297dfd3e07d4 Mon Sep 17 00:00:00 2001
From: xiangwb <xiangwb@drore.com>
Date: Wed, 28 Mar 2018 16:52:57 +0800
Subject: [PATCH] merge

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index f4e74f0..be93dac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ mvnw
 mvnw.cmd
 .mvn
 ### eclipse ###
+.settings
 */.project
 */.classpath
 */.settings