diff options
| author |   Mauro Sardara <msardara@cisco.com> | 2019-01-24 10:19:54 +0100 |
|---|---|---|
| committer | Mauro Sardara <msardara@cisco.com> | 2019-01-24 10:19:54 +0100 |
| commit | 31e45f091ead0360afdd564e54a07dd963f296d4 (patch) | |
| tree | 40e927b7a214486fc1809633a9a29360cd65fc48 /libtransport/cmake/Modules | |
| parent | bed18df840364847e378d1ce2dea2fbace029720 (diff) | |
Fix typo.
Change-Id: I1300f848a22ef20a8f4a76f2a4bd504031b321cf
Signed-off-by: Mauro Sardara <msardara@cisco.com>
Diffstat (limited to 'libtransport/cmake/Modules')
| -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." |