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/device/camera.cc
+++ b/samples/device/camera.cc
@@ -15,17 +15,9 @@
 #include <opencv2/imgproc/imgproc.hpp>

 #include "mynteye/logger.h"
-<<<<<<< HEAD
-
-#include "mynteye/device.h"
-#include "mynteye/utils.h"
-
-#include "mynteye/times.h"
-=======
 #include "mynteye/device/device.h"
 #include "mynteye/device/utils.h"
 #include "mynteye/util/times.h"
->>>>>>> origin/develop

 MYNTEYE_USE_NAMESPACE