From ffa3485e9d36911f3b6aeac7ddbcca61c3e3dde6 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 10 一月 2019 20:12:15 +0800
Subject: [PATCH] Merge svn 3352

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

diff --git a/.gitignore b/.gitignore
index ccb23fd..cc7ee11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,5 @@
 build-QiaoJiaSystem-unknown-Default/
 
 QiaoJiaSystem/build/glog_dump\.log
+
+QiaoJiaSystem/CMakeLists\.txt\.user

--
Gitblit v1.8.0