From 1ae479735ce9d73d7d654faaeffe9f8ac6570733 Mon Sep 17 00:00:00 2001
From: Rick Lan <ricklan@gmail.com>
Date: Fri, 21 Jun 2024 13:43:56 +0800
Subject: [PATCH] Fixed merge issue.

---
 selfdrive/ui/qt/onroad/annotated_camera.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/selfdrive/ui/qt/onroad/annotated_camera.cc b/selfdrive/ui/qt/onroad/annotated_camera.cc
index 1ae05aa98..7de2cc149 100644
--- a/selfdrive/ui/qt/onroad/annotated_camera.cc
+++ b/selfdrive/ui/qt/onroad/annotated_camera.cc
@@ -38,7 +38,7 @@ AnnotatedCameraWidget::AnnotatedCameraWidget(VisionStreamType type, QWidget* par
 
   // Add the horizontal layout to the main_layout
   main_layout->addLayout(horizontalLayout);
-  #else
+  #endif
 
   dm_img = loadPixmap("../assets/img_driver_face.png", {img_size + 5, img_size + 5});