fix: proper conflict resolution

eclipse-zenoh · Oct 25, 2024 · 3744a1c · 3744a1c
1 parent a4c9270
commit 3744a1c
Showing 1 changed file with 0 additions and 25 deletions.
diff --git a/install/cpack_project_config.cmake b/install/cpack_project_config.cmake
@@ -1,30 +1,5 @@
 if(CPACK_GENERATOR MATCHES "DEB")
     # DEB package
-<<<<<<< HEAD
-<<<<<<< HEAD
-||||||| parent of e85200e2 (fix: set debarch according to target not host)
-    if(NOT DEBARCH)
-        execute_process(
-        COMMAND dpkg --print-architecture
-        OUTPUT_VARIABLE DEBARCH
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        )
-    endif()
-=======
-    if(NOT DEBARCH)
-        set(DEBARCH ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
-    endif()
->>>>>>> e85200e2 (fix: set debarch according to target not host)
-||||||| parent of d9032ef3 (add sample toolchains and fix library names)
-    if(NOT DEBARCH)
-        execute_process(
-        COMMAND dpkg --print-architecture
-        OUTPUT_VARIABLE DEBARCH
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        )
-    endif()
-=======
->>>>>>> d9032ef3 (add sample toolchains and fix library names)
     message(STATUS "Configure DEB packaging for Linux ${DEBARCH}")
     set(CPACK_DEBIAN_PACKAGE_MAINTAINER "ZettaScale Zenoh Team, <[email protected]>")
     set(CPACK_DEB_COMPONENT_INSTALL ON)