From 51202f33eaed6043aedd10ba6fb0e3e0a519d613 Mon Sep 17 00:00:00 2001
From: Ignacio Vizzo <ignacio@dexory.com>
Date: Mon, 22 Jul 2024 14:45:23 +0200
Subject: [PATCH] Fix merge conflict

---
 cpp/kiss_icp/core/Preprocessing.hpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/cpp/kiss_icp/core/Preprocessing.hpp b/cpp/kiss_icp/core/Preprocessing.hpp
index 004abd6c..d161177d 100644
--- a/cpp/kiss_icp/core/Preprocessing.hpp
+++ b/cpp/kiss_icp/core/Preprocessing.hpp
@@ -31,8 +31,4 @@ namespace kiss_icp {
 std::vector<Eigen::Vector3d> Preprocess(const std::vector<Eigen::Vector3d> &frame,
                                         double max_range,
                                         double min_range);
-
-/// Voxelize point cloud keeping the original coordinates
-std::vector<Eigen::Vector3d> VoxelDownsample(const std::vector<Eigen::Vector3d> &frame,
-                                             double voxel_size);
 }  // namespace kiss_icp