Fix the conflict again

2018-11-24 16:56:52 +08:00
parent 1811f20a14
commit b346f7fec9
27 changed files with 0 additions and 230 deletions
--- a/samples/uvc/camera.cc
+++ b/samples/uvc/camera.cc
@@ -17,12 +17,9 @@
 #include <iostream>
 #include <mutex>

-<<<<<<< HEAD
-=======
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>

->>>>>>> origin/develop
 #include "mynteye/logger.h"
 #include "mynteye/mynteye.h"
 #include "mynteye/types.h"