From 999d8a80d9a1c1f20033c29e7e2a08951766bee8 Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Mon, 13 Nov 2017 16:16:34 +0800
Subject: [PATCH] Merge branch 'master' of http://fengxiang@blit.7drlb.com:8888/r/task.git

---
 .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