clean up trash

5 years ago · dfe0544a93
parent e84224ed45
commit dfe0544a93
1 changed files with 0 additions and 1 deletions
--- a/selfdrive/camerad/main.cc
+++ b/selfdrive/camerad/main.cc
@ -632,7 +632,6 @@ void* processing_thread(void *arg) {

    visionbuf_sync(&s->rgb_bufs[rgb_idx], VISIONBUF_SYNC_FROM_DEVICE);

-<<<<<<< HEAD
 #ifdef NOSCREEN
  if (frame_data.frame_id % 4 == 1) {
    sendrgb(&s->cameras, (uint8_t*) s->rgb_bufs[rgb_idx].addr, s->rgb_bufs[rgb_idx].len, 0);