From 4001288af80a5e07bb96dd2a7d41d7cb0052a560 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 26 十二月 2018 14:01:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature_addPersonTracking' into feature_addPersonTracking

---
 QiaoJiaSystem/build/DataWebServer |    0 
 .gitignore                        |    8 +++++++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6dde67c..0aa5b65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,12 @@
 *.out
 *.app
 
-QiaoJiaSystem/\.idea/
+\.idea/
+
+syncDBTool/cmake-build-debug/
 
 QiaoJiaSystem/cmake-build-debug/
+
+QiaoJiaSystem/YoloServer/cmake-build-debug/
+
+syncDBTool/\.fuse_hidden00038cb8000000da
diff --git a/QiaoJiaSystem/build/DataWebServer b/QiaoJiaSystem/build/DataWebServer
index b288461..6b230b1 100644
--- a/QiaoJiaSystem/build/DataWebServer
+++ b/QiaoJiaSystem/build/DataWebServer
Binary files differ

--
Gitblit v1.8.0