From e1d7e82725a6ee591b399f89544b64a4f07b624d Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 26 十二月 2018 15:06:14 +0800
Subject: [PATCH] Merge branch 'Develop'

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

diff --git a/.gitignore b/.gitignore
index 0def275..6dde67c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,7 @@
 *.exe
 *.out
 *.app
+
+QiaoJiaSystem/\.idea/
+
+QiaoJiaSystem/cmake-build-debug/

--
Gitblit v1.8.0