Fix the conflict

2018-11-24 16:43:38 +08:00
parent 210ddba1ba 0fc1196b52
commit 1811f20a14
264 changed files with 29737 additions and 970 deletions
--- a/samples/device/camera.cc
+++ b/samples/device/camera.cc
@@ -15,11 +15,17 @@
 #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