Merge master and resolve conflicts

1 files changed, 3 insertions, 3 deletions

diff --git a/src/Subsampling/example/example_custom_kernel.cpp b/src/Subsampling/example/example_custom_kernel.cpp
index f1eb757b..535bf42a 100644
--- a/src/Subsampling/example/example_custom_kernel.cpp
+++ b/src/Subsampling/example/example_custom_kernel.cpp
@@ -55,9 +55,9 @@ int main(void) {
   Gudhi::subsampling::choose_n_farthest_points(k, points, 2,
                                                Gudhi::subsampling::random_starting_point,
                                                std::back_inserter(results));
-  std::cout << "Before sparsification: " << points.size() << " points.\n";
-  std::cout << "After  sparsification: " << results.size() << " points.\n";
-  std::cout << "Result table: {" << results[0] << "," << results[1] << "}\n";
+  std::clog << "Before sparsification: " << points.size() << " points.\n";
+  std::clog << "After  sparsification: " << results.size() << " points.\n";
+  std::clog << "Result table: {" << results[0] << "," << results[1] << "}\n";
 
   return 0;
 }