From 85af96d3ed6b117d2ef318fc46baedce66c59dd9 Mon Sep 17 00:00:00 2001
From: Mederic Fourmy <mederic.fourmy@gmail.com>
Date: Tue, 3 May 2022 20:26:08 +0200
Subject: [PATCH] Forgot some merge artefacts
---
cmake_modules/wolfvisionConfig.cmake | 4 ----
1 file changed, 4 deletions(-)
diff --git a/cmake_modules/wolfvisionConfig.cmake b/cmake_modules/wolfvisionConfig.cmake
index b5cb73640..7c5932179 100644
--- a/cmake_modules/wolfvisionConfig.cmake
+++ b/cmake_modules/wolfvisionConfig.cmake
@@ -48,11 +48,7 @@ macro(wolf_report_not_found REASON_MSG)
# FindPackage() use the camelcase library name, not uppercase.
if (wolfvision_FIND_QUIETLY)
message(STATUS "Failed to find wolfvision- " ${REASON_MSG} ${ARGN})
-<<<<<<< HEAD
- elseif(wolfvision_FIND_REQUIRED)
-=======
elseif (wolfvision_FIND_REQUIRED)
->>>>>>> devel
message(FATAL_ERROR "Failed to find wolfvision - " ${REASON_MSG} ${ARGN})
else()
# Neither QUIETLY nor REQUIRED, use SEND_ERROR which emits an error
--
GitLab