From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

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

diff --git a/.gitignore b/.gitignore
index 84279dd..e2bf83d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -199,3 +199,4 @@
 *._
 *.ide
 ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
+ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide

--
Gitblit v1.8.0