From 2d4cbcc4f92edbc4f926d9710bdda64520039c2b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 05 Jan 2018 11:21:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

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

diff --git a/.gitignore b/.gitignore
index 03e50e6..22ea4c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,5 @@
 .DS_Store
 Thumbs.db
 .angulardoc.json
+yarn.lock
+

--
Gitblit v1.8.0