From 04cce9af0630ed792f9619209c1f74038bd06f90 Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Sun, 11 Mar 2018 12:09:56 +0800
Subject: [PATCH] merge

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

diff --git a/.gitignore b/.gitignore
index 8cb7473..9c420fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,17 @@
-### IntelliJ IDEA ###
-.idea
-.mvn
-*.iml
 logs
 */target
+
+### IntelliJ IDEA ###
+.idea
+*.iml
+*.iws
+*.ipr
 */*.iml
 
 ### maven ###
 mvnw
 mvnw.cmd
+.mvn
 
 ### eclipse ###
 */.project