From 18403aa060ac9c2f8c81815c7891dfd261812bf8 Mon Sep 17 00:00:00 2001
From: Joseph Mirabel <jmirabel@laas.fr>
Date: Wed, 10 May 2017 16:32:39 +0200
Subject: [PATCH] Fix CMakeLists.txt
---
CMakeLists.txt | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9b33e28..855a860e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,17 +117,6 @@ SET(${PROJECT_NAME}_HEADERS
include/hpp/fcl/collision_node.h
include/hpp/fcl/collision_func_matrix.h
include/hpp/fcl/distance.h
-<<<<<<< HEAD
- include/hpp/fcl/knn/greedy_kcenters.h
- include/hpp/fcl/knn/nearest_neighbors_GNAT.h
- include/hpp/fcl/knn/nearest_neighbors_flann.h
- include/hpp/fcl/knn/nearest_neighbors_sqrtapprox.h
- include/hpp/fcl/knn/nearest_neighbors_linear.h
- include/hpp/fcl/knn/nearest_neighbors.h
- include/hpp/fcl/math/vec_nf.h
-=======
- include/hpp/fcl/continuous_collision.h
->>>>>>> jmirabel/devel
include/hpp/fcl/math/matrix_3f.h
include/hpp/fcl/math/vec_3f.h
include/hpp/fcl/math/tools.h
@@ -150,16 +139,7 @@ SET(${PROJECT_NAME}_HEADERS
include/hpp/fcl/collision_object.h
include/hpp/fcl/octree.h
include/hpp/fcl/fwd.hh
-<<<<<<< HEAD
- include/hpp/fcl/eigen/math_details.h
- include/hpp/fcl/eigen/vec_3fx.h
- include/hpp/fcl/eigen/product.h
- include/hpp/fcl/eigen/taylor_operator.h
- include/hpp/fcl/eigen/plugins/ccd/interval-matrix.h
- include/hpp/fcl/eigen/plugins/ccd/interval-vector.h
include/hpp/fcl/mesh_loader/assimp.h
-=======
->>>>>>> jmirabel/devel
)
add_subdirectory(src)
--
GitLab