From e2ec42921840535c445e40b76661d0ffd9baef8f Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 15 三月 2019 11:27:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yw.1.2.fixbug' into yw.1.2

---
 QiaoJiaSystem/FaceSearchServer/LoadFeaTool/CMakeLists.txt |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/QiaoJiaSystem/FaceSearchServer/LoadFeaTool/CMakeLists.txt b/QiaoJiaSystem/FaceSearchServer/LoadFeaTool/CMakeLists.txt
index 2c8486f..e2cee97 100644
--- a/QiaoJiaSystem/FaceSearchServer/LoadFeaTool/CMakeLists.txt
+++ b/QiaoJiaSystem/FaceSearchServer/LoadFeaTool/CMakeLists.txt
@@ -20,7 +20,6 @@
     ../../../../BasicPlatForm/libs/jsoncpp/lib
 )
 
-
 add_executable(syncDBClient
     main.cpp
 

--
Gitblit v1.8.0