From 126248cd76980771573a0c1e91d574eaed6ea5e3 Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Sun, 11 Mar 2018 12:07:15 +0800
Subject: [PATCH] merge

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 87b39d4..8cb7473 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,12 +3,13 @@
 .mvn
 *.iml
 logs
-
 */target
 */*.iml
 
+### maven ###
 mvnw
 mvnw.cmd
+
 ### eclipse ###
 */.project
 */.classpath