From 70c4207810e4348ad9c125c44cbb6842ecd8b4b7 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 28 Nov 2017 06:31:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 .gitignore |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index b83d222..080fe69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 /target/
+/src/main/webapp/WEB-INF/
+/.settings/

--
Gitblit v1.8.0