aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMeyer Zinn <meyerzinn@gmail.com>2020-04-13 10:40:54 -0500
committerMeyer Zinn <meyerzinn@gmail.com>2020-04-13 10:40:54 -0500
commit90f204d9d842b85925e12a26a24ad2dcb17e5c99 (patch)
treec02219cb62fe83b058105bb67a61af00116fddd0
parent6ea5afaf9ca477a2cc81647184ba2e3d44a9d3b2 (diff)
parent37578d6df2888278da8dfcec7d3eee213d1ce652 (diff)
downloadvcpkg-90f204d9d842b85925e12a26a24ad2dcb17e5c99.tar.gz
vcpkg-90f204d9d842b85925e12a26a24ad2dcb17e5c99.zip
resolve merge conflicts
-rw-r--r--ports/quadtree/portfile.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/ports/quadtree/portfile.cmake b/ports/quadtree/portfile.cmake
index 581877607..be972daa1 100644
--- a/ports/quadtree/portfile.cmake
+++ b/ports/quadtree/portfile.cmake
@@ -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) \ No newline at end of file
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${port} RENAME copyright)