resolve merge conflicts

This commit is contained in:
Meyer Zinn 2020-04-13 10:40:54 -05:00
commit 90f204d9d8

View File

@ -16,4 +16,4 @@ vcpkg_configure_cmake(
)
file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/quadtree)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${port} RENAME copyright)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${port} RENAME copyright)