From 2ce4becc927e5028f6ebeb5e8f38d0eb0fbec118 Mon Sep 17 00:00:00 2001
From: 孙天宇 <suntianyu@aiotlink.com>
Date: 星期二, 12 七月 2022 17:35:16 +0800
Subject: [PATCH] add gitignore
---
demo.cpp | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/demo.cpp b/demo.cpp
index 29242d6..804ab43 100644
--- a/demo.cpp
+++ b/demo.cpp
@@ -48,11 +48,6 @@
for (int i=0; i<t_result->count; i++)
{
cout << "confidence:" << t_result->targets[i].confidence << endl;
-<<<<<<< HEAD
- //draw_SDK_result(frame, t_result->targets[i]);
-=======
- // draw_SDK_result(frame, t_result->targets[i]);
->>>>>>> e47cdf6abec38e5249f5258bc7b98824b67eb79f
}
}else{
cout << "------------over--" << endl;
--
Gitblit v1.8.0