diff options
Diffstat (limited to 'libtransport/cmake/Modules/Packaging.cmake')
| -rwxr-xr-x | libtransport/cmake/Modules/Packaging.cmake | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libtransport/cmake/Modules/Packaging.cmake b/libtransport/cmake/Modules/Packaging.cmake index 6dc0eb457..84e58c962 100755 --- a/libtransport/cmake/Modules/Packaging.cmake +++ b/libtransport/cmake/Modules/Packaging.cmake @@ -52,11 +52,7 @@ if ((BUILD_MEMIF_CONNECTOR OR BUILD_VPP_PLUGIN) AND "${CMAKE_SYSTEM_NAME}" STREQ ) else() -<<<<<<< HEAD - -======= ->>>>>>> 691dfde... [HICN-3] First version of packaging system based on cmake. set(lib${LIBTRANSPORT}_DEB_DEPENDENCIES "libhicn (>= 1.0), libparc (>= 1.0)" CACHE STRING "Dependencies for deb/rpm package." |