fix merge artifacts

1 files changed, 0 insertions, 22 deletions

diff --git a/src/camera/veyeimx287m.cpp b/src/camera/veyeimx287m.cpp
index 3f3a9e6..b8fdbb4 100644
--- a/src/camera/veyeimx287m.cpp
+++ b/src/camera/veyeimx287m.cpp
@@ -16,11 +16,7 @@
 
 #include <QElapsedTimer>
 
-<<<<<<< Updated upstream
-// orpheus
-=======
 #include "camera/veye_i2c.h"
->>>>>>> Stashed changes
 #include "constants.h"
 #include "httpservice.h"
 #include "imagealgos.h"
@@ -654,7 +650,6 @@ bool VeyeIMX287m::initCam()
     return true;
 }
 
-<<<<<<< Updated upstream
 bool VeyeIMX287m::initHttpServer()
 {
     m_httpServer = std::make_shared<HttpServer>(this);
@@ -662,23 +657,6 @@ bool VeyeIMX287m::initHttpServer()
     return m_httpServer != nullptr;
 }
 
-void VeyeIMX287m::dequeueFrameLoop(std::stop_token stopToken)
-{
-    // std::cout << "VeyeIMX287m: start stream" << std::endl;
-
-    // while (!stopToken.stop_requested()) {
-    //     size_t imageIndex{};
-
-    //     if (!dequeueImageBuffer(imageIndex))
-    //         // break;
-    //         continue;
-    // }
-
-    // std::cout << "VeyeIMX287m: stream interruption requested" << std::endl;
-}
-
-=======
->>>>>>> Stashed changes
 void VeyeIMX287m::calcFrameLoop(std::stop_token stopToken)
 {
     QElapsedTimer t;