From 23bd97eaa5626ad96ca3f5d3e97e93d14705ca6d Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期六, 30 三月 2019 17:50:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yangwu1.3' into 1.3nsq

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

diff --git a/.gitignore b/.gitignore
index d757c14..662f3db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,5 @@
 
 QiaoJiaSystem/build/\.fuse_hidden*
 
+
+QiaoJiaSystem/enctest/cmake-build-debug/

--
Gitblit v1.8.0