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/src/mynteye/uvc/linux/uvc-v4l2.cc
+++ b/src/mynteye/uvc/linux/uvc-v4l2.cc
@@ -409,16 +409,12 @@ struct device {
    }

    if (no_data_count > NO_DATA_MAX_COUNT) {
-<<<<<<< HEAD:src/uvc/uvc-v4l2.cc
      no_data_count = 0;
      living_count = 0;
      LOG(WARNING) << __func__
                   << " failed: v4l2 get stream time out,Try to reboot!";
      stop_capture();
      start_capture();
-=======
-      throw_error("v4l2 get stream time out!");
->>>>>>> origin/develop:src/mynteye/uvc/linux/uvc-v4l2.cc
    }
  }