merge

2018-03-11 12:09:56 +08:00
parent 126248cd76
commit 04cce9af06
1 changed files with 7 additions and 4 deletions
@@ -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