From 17ae0cd78c16f55d38dc3f9ad6b27688f445aee3 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 09:57:19 +0800
Subject: [PATCH] Merge branch '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