Resolve merge conflict

vmaksimo · vmaksimo · commit aa0479bf3677 · 2025-08-04T09:14:26.000-07:00
diff --git a/llvm/lib/Frontend/Offloading/CMakeLists.txt b/llvm/lib/Frontend/Offloading/CMakeLists.txt
@@ -1,12 +1,8 @@
 add_llvm_component_library(LLVMFrontendOffloading
   Utility.cpp
   OffloadWrapper.cpp
-<<<<<<< HEAD
   SYCLOffloadWrapper.cpp
-
-=======
   PropertySet.cpp
->>>>>>> 185a23e865c31145588276e7e0db2460e01eb703
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Frontend
