.3nsq: Auto stash before merge of "1.3nsq" and "origin/1.3nsq"

pans

2019-04-15 0a762a217fe499b7b63d55ed4b46dde1afd49f28

 QiaoJiaSystem/YoloServer/YoloRpcElement.h

@@ -7,7 +7,8 @@
#include <opencv2/opencv.hpp>
#include <basic/util/fastdfs/FastFds.hpp>
#include <TriggerElement.h>
#include "TrackingTrigger.h"
//#include "../StructureApp/YoloRpcElement.h"
#include "../StructureApp/TrackingTrigger.h"

class QSharedMemory;