From 46ca57d5f64bafb642017b50c2fba85e38ca2289 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 20 Jul 2018 10:05:49 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2

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

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

--
Gitblit v1.8.0