From 79045dd77eada57ac82851289411f36485284d86 Mon Sep 17 00:00:00 2001
From: "Mata.Li" <Mata.Li@fanruan.com>
Date: Wed, 20 Jun 2018 20:33:27 +0800
Subject: [PATCH] fix conflict

---
 .gitignore | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 548135b38..417bed08c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,9 +4,5 @@
 .classpath
 .project
 target/
-${web-inf-path}/
-assets/
-lib/
-logs/