From 072f1c666b2367a1feafcb94dacc620ebc341ef6 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 27 Dec 2017 09:40:10 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

---
 .gitignore |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 54bfd20..22ea4c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,10 +19,6 @@
 
 # IDE - VSCode
 .vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
 
 # misc
 /.sass-cache
@@ -40,3 +36,6 @@
 # System Files
 .DS_Store
 Thumbs.db
+.angulardoc.json
+yarn.lock
+

--
Gitblit v1.8.0