From 4d1c2ee860222138fc7932225ea6d91e7483646a Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期一, 22 四月 2019 11:18:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq

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

diff --git a/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt b/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt
index 26f313c..5860601 100644
--- a/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt
+++ b/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt
@@ -89,7 +89,6 @@
 add_executable(${PROJECT_NAME}
     main.cpp
     rpc/FaceSearchServer.cpp
-    FaceSearchServerResources.cpp
     FaceFeatureSearchServerI.cpp
     FaceFeatureSearchServerI.h
     CasiaFaceWrapper/CasiaFaceWrapperN.cpp

--
Gitblit v1.8.0