From 2af0b3ec07a81c18c08c07d92f87b3462d809988 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Enrique=20Dom=C3=ADnguez?=
<jdominguez@iri.upc.edu>
Date: Fri, 11 Oct 2019 09:29:49 +0200
Subject: [PATCH] Solved typo
---
include/iri_nav_hole_detection_alg.h | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/include/iri_nav_hole_detection_alg.h b/include/iri_nav_hole_detection_alg.h
index 4649017..9ef6747 100644
--- a/include/iri_nav_hole_detection_alg.h
+++ b/include/iri_nav_hole_detection_alg.h
@@ -132,22 +132,12 @@ class HoleDetectionAlgorithm
*
*/
~HoleDetectionAlgorithm(void);
-<<<<<<< HEAD:include/hole_detection_alg.h
-
- void cloud_all(int hole_min_p, float box_y_end, float box_z_ini,
- float box_x, float box_y_ini, float box_z_end,
- float Xl, float Xc, float Xr, float Y,
- pcl::PointCloud<pcl::PointXYZRGB>& cloud_in,
- pcl::PointCloud<pcl::PointXYZ>::Ptr& cloud_out);
-
-=======
void cloud_all(int hole_min_p, float box_z_end, float box_x_ini,
float box_y, float box_z_ini, float box_x_end, int num_cells, float Z,
pcl::PointCloud<pcl::PointXYZRGB>& cloud_in,
pcl::PointCloud<pcl::PointXYZ>::Ptr& cloud_out);
->>>>>>> axis_Z_to_axis_X_migration:include/iri_nav_hole_detection_alg.h
};
#endif
--
GitLab