From 0436e5443295395025f89f0d091aab1e9551d1a4 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 10 一月 2019 20:26:31 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of ssh://192.168.1.226:29418/development/c++ into ywv1.2

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

diff --git a/.gitignore b/.gitignore
index cc7ee11..22d3786 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,5 @@
 QiaoJiaSystem/build/glog_dump\.log
 
 QiaoJiaSystem/CMakeLists\.txt\.user
+
+\.idea/

--
Gitblit v1.8.0