From 0b15d2d7452f4cdbb2295bec1979fe9194ae7400 Mon Sep 17 00:00:00 2001
From: T <3923106166@qq.com>
Date: Mon, 2 Dec 2024 15:41:12 +0800
Subject: [PATCH] fix conficts (#32)

---
 examples/omni-vlm/CMakeLists.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/examples/omni-vlm/CMakeLists.txt b/examples/omni-vlm/CMakeLists.txt
index 7bfe64d39..45c47c57a 100644
--- a/examples/omni-vlm/CMakeLists.txt
+++ b/examples/omni-vlm/CMakeLists.txt
@@ -39,11 +39,7 @@ target_compile_features(${TARGET} PRIVATE cxx_std_11)
 
 #=== for omni-vlm-wrapper
 add_library(omni_vlm_wrapper_shared SHARED omni-vlm-wrapper.cpp $<TARGET_OBJECTS:omni_vlm>)
-<<<<<<< HEAD
 target_link_libraries(omni_vlm_wrapper_shared PRIVATE common ggml llama ${CMAKE_THREAD_LIBS_INIT})
-=======
-target_link_libraries(omni_vlm_wrapper_shared PRIVATE common ggml_llama llama ${CMAKE_THREAD_LIBS_INIT})
->>>>>>> master
 # For Nexa SDK library installation
 set_target_properties(omni_vlm_wrapper_shared PROPERTIES
                      PUBLIC_HEADER "omni-vlm-wrapper.h"