From 124766132b01645c9942f4cadd7cb88953bfc728 Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang>
Date: Wed, 20 Dec 2017 14:00:10 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

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

diff --git a/.gitignore b/.gitignore
index 54bfd20..03e50e6 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,4 @@
 # System Files
 .DS_Store
 Thumbs.db
+.angulardoc.json

--
Gitblit v1.8.0