From 43f2601b8a5706a029f333204f7f52f153d61dfe Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 08 Mar 2018 09:22:20 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

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

diff --git a/.gitignore b/.gitignore
index 03e50e6..dbb8954 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,7 @@
 .DS_Store
 Thumbs.db
 .angulardoc.json
+yarn.lock
+/_nginx/*
+.github/*
+

--
Gitblit v1.8.0